branch commit
conflict commit
master commit compared with branch conflict
conflict fixed