County discusses shelving Conflict Mitigation Zoning District