They always have been. The new XIB format is the same as the current Storyboard format.

It doesn't completely prevent merge conflicts though.