Tried to merge conflicts in CarSim.java