merge namespace fix, address conflicts