GIT STASH POP CONFLICT