added isDriveable and travelSpeed to Road Enums andd conflict resolved
added isDriveable and travelSpeed to Road Enums andd conflict resolved