fix conflicts
changed department logo