fix merge namespace mistake