3. Select Branch option, then master of the master branch, and click the OK button. Merging is completed. 4. Click the Close button. In the example of this document, conflicts do not occur when merging the changes. If the same portion of data in the Machine A and B are modified, a conflict occurs and merge processing fails. In that case, in order to maintain the changes for Machine B in Configurations and Setup, merge the changes preferring changes of Product B branch. For the procedure to resolve conflicts, refer to 7.3.3.12 Merges the changes in the working branch of Developer B to the main branch (No.12: Developer B). 120 Sysmac Studio Project Version Control Function Startup Guide (P125)