Add cars logo
Fix merge conflict