# Conflicts: # car_inventory/settings.py # inventory/models.py # inventory/services.py # inventory/urls.py # inventory/views.py