Fixed stash merge conflict.