merging stashed changes