https://jdhao.github.io/2019/12/03/git_stash_merge_conflict_handling/