conflict git
conflict2 git
conflict solved