fixed merge
fixing merges in solveWeightsHornSchunk