hoping to create a stash pop merge conflict.