Fixed merge error on update_role call
Fixed merge error on update_role call

rapidpro/casepro,rapidpro/casepro,praekelt/casepro,rapidpro/casepro,xkmato/casepro,praekelt/casepro,xkmato/casepro,praekelt/casepro