merge with local stashed changes