fixed patients page
fixed conflict