file1
conflict solved