Minor fixes, conflicts in solver mode work now