Update git_merge_conflicts.md

added git stash drop command