add two.txt
add aaaa
add bbbb
resolve conflict
add one