Fix wtf stash apply/merge conflicts
Merge pull request #3 from mknudsen01/fix

Fix wtf stash apply/merge conflicts