some changes made to file3
modify merge conflict