modified test.txt again
merge finished