Fixed conflict between district id and district code
Merge branch 'master' of https://github.com/elieish/yard