Stashing as a commit.
Corrected for merge