fix bug 1112932 - remove conflict markers

@lonnen - did I pick the right side of the conflict here?