fixed merge conflict in namespace