Fix wtf stash apply/merge conflicts