doctor add address finished
fix merge conflict