fixing git stash conflicts