start fixing
city page fix
fixing conflicts