resolve conflict on test1.txt