Merged Conflicts correctly