Tesla to fix touch screens, ending spat with US regulators