Fixed merge conflict area inside CARValidator class; car_validator branch commits seem to still exist, hmmm, I suck at Git