conflicting changes introduced in file 2
merged file2