Adding the Merge Conflict