dfsdfasdfasdfasdfsdafasf
otherbr
And simple
& simple
conflict fixed
step3
step4
step5
step6
step7
step8
Merge branch 'feature1'