add surround city ring
fix conflicts