modified file3 after merge