Merge-Conflicts lösen