Added boss and merchant
nothing added