Maybe I didn’t explain myself properly in the last part. Say we update to engine version 5.5 and we resolver a conflict where we had custom code in EngineCodeExample.cpp. Thats fine. Now we want to update to version 5.6, which 5.6 changed EnginceCodeExample.cpp again. However we haven’t made any new custom modifications to it since we upgraded to 5.5. Because there is no new modifications, there will be no conflict in the merge branch and 5.6 version will be copied upwards deleting all the custom modifications we added before updating to 5.5. I don’t believe this is the intended behavior. The whole point of the merge branch is to bring the newer engine version and merging it with the custom changes to the engine on the project.