ACT regulators cut deal, but still an Uber fight elsewhere