branch test
branch feature1
master
master
conflict fixed
delete branch