resoled conflicts