changing file1 now
solving conflict