edited merge conflict in to desired code.  builds and all tests are successful.