make some changes
merge conflict for file3 resolved