add Bosses
fix merging problems