Dealing with Merge Conflict