merge main development branch
refactored conflict logic
F56 Build and Price, ready for review
Updated Wheel Event
Updated Interior Click Event
Merge pull request #441 from shutter111/development

F56 Build and Price, ready for review