Fixed minor issues with merge and dbz boss level.