Merged conflict during git stash apply