Change second line in test1
Resolve conflict file.txt