- conflic resolved