Fixed merge conflict from storyboard after stash apply.
Merge conflict from stashed changes.
Fixed a merge conflict error.