restore rowToDoctor
fix merge conflicts