It would be great to have the comparison GUI in the Mendix modeler to resolve the merge conflicts. Difference between two commits.