title: Xcode crashes when there is conflict in storyboard
body: <p>I committed my changes to <code>git</code> and then asked my teammate to pull from the repository. When he did a pull, it showed a conflict with storyboard. If he clicks on the storyboard file in order to resolve it, Xcode crashes.</p>
  
  <p>Are we doing something wrong here or is Xcode just really buggy?</p>