Posting two hours spent fixing a problem resulting from svn conflicts and merges in MoEML. It had to be done before we went home because the only person who knew which bits of the file should be retained from each version was heading out on vacation and wouldn't be available.