Merged local stashed changes.