all conflicts ressolved