stashing changes for a merge