Merge pull request #440 from jonezy/development

Feb 27 updates
merge main development branch
refactored conflict logic
F56 Build and Price, ready for review
Updated Wheel Event
Updated Interior Click Event
Merge pull request #443 from jonezy/development

synching with master