add city ring select function
fix conflicts