edit file5
Edit file 6
File2 edits with conflict
reset files3&4 then fix file2