Update Garage.py

Fixing Conflicts