fix some unterminated #ifdef

Conflict Solver fucked up a bit so i have to fix the typos.
hopefully it fixes Color Control building.