Modifying a different file than it has conflicts