Reforming institutions and resolving conflicts