fix department and user relations
merge code