Streetcar fare battle between mayor, city council heats up