Merge new fixture problems

I have a new single fixture file from the library dept, I am trying to merge it into my current show v 4.0.96, the new fixture is v 4.2.155, I have tried several times to merge and get all the way to merge finished with "Merge Failed" on the line before.
Related