add new post of solve conflict caused by git stash