mentioned conflicts on git pull