Updating Solver
Fixing the conflicts due to merge
Updating Board and Solver