no merge conflicts on git pull