new doctor stuff
resolving conflicts again