delete aaa
only a
merge
dev1 changed
dev2
a
change