Glad you corrected the issue. I recently ran into the same issue. It a merge conflict and that is why Xcode is throwing that error. Within the .xib file you will see something like:
<<<<<<< HEAD
// code
=======
// code
>>>>>>> apps
You can do what you did above, or manually correct the merge conflict issues by opening the .xib file in XCode(In XCode, right click on the storyboard/xib file -> Select 'Open As' -> Source Code) or in a text editor. After correcting it the file should open fine in Xcode.