also changed file2.txt
Resolved conflict