feature1 commit
master commit
conflict fixed