Convert conflicts to uniqueid
Convert the solver and finish converting conflicts to uniqueid