Rename audi2 to audi
Fix conflicts