incorporate local stashed changes