resolving storyboard xml errors

when i encountered the merge conflict, I accepted both Courtney and my changes, but because we had different entry points for our story board files, keeping both left us with two opening <document> tags with only one </document> tags which obviously is not well formed. to fix, I ran the xml through a validator to track down the errors