This line...
<segue reference="N5A-C3-Xff"/>
...will probably have to be removed after merge - the storyboard won't build otherwise.
(It's because the id it references was trimmed in merge of the previous branches. I wrote a bit of utility code for checking storyboard files for such orphaned references.)