delete 4 by branch1
delete 2 and add 5 by branch1
merging success