Modifying merge conflicted parts