Remerge solve.clp