cleaning up git merge text in prototypeWithConstructor