modified file3 again
resolved conflict