resolve namescape conflict
merge fixed