merge tool test
add back to master
add aaaa
delete aaaa
delete aaa
merge fixed