working on district popup
popup in htc sites
merged conflicts