branch test
conflict test
conflict with feature1
 add some
conflict fixed
conflict test2
master conflict test2
conflict fixed test2