Fixing the Merge Conflicts