fix the conflict between city and area