modified two files (namespace change) after merge changes