remove test1
test2 cr1
remove test2
add test1
new test3
merge test3