add new boss
conflict removed