edit file1
conflict solved