Update departments-master.html

conflict fix