branch test
feature1
master
conflict fixed