Editor changes
Resolving merge conflict.
Fixing storyboard.