smus-git-test-cmh This line was edited on GitHub to create a conflict. Edited from GitHub - second time.