modify test.txt too
resolve conflict