Improve department module
Merge with department branch