git stash merge conflict resolve