Fix some merge fails

ausarbeitung.ipynb

datasheets/axles.json

datasheets/batteries.json

datasheets/frame.json

datasheets/gears.json

datasheets/motors.json

datasheets/wheels.json

functions/classes.py