fixing conflict
Removed old vehicle class