commit to branch
conflict fixed
conflict solved