changes in car catalog module
merge conflict