bug fixes

1. null reference in car add to cart
2. passengers age changes
3. removed warnings
resolved conflicts and merged code