Manually fixed merge problems.  I think.