modified test.txt
conflict resolved, using theirs