resolver merge prob
resolver merge prob