2nd time to deal with conflicts
after solving the 2nd conflict