Manually edited XML in Main.storyboard to fix a merge conflict issue.