File2 edits with conflict