doctor home page starting to work
fix merge conflict