Removed remnants of stash merge error.