Merging the two solvers into just one.