Merging changes in generated product

When merging changes to files, do a three-way merge between:

• File as originally generated by Advanced Product Designer
• Modifications that you made to the file
• File as generated this time by Advanced Product Designer