Create test_merge.txt
Update aaa
fix conflict