Temporary fix to Main.storyboard: revert changes made by Julia as it makes XCode crash
Tried to save most of Julia's work by manually merging diff line-by-line