conflicting changes introduced in file 2