am -3: do not let failed merge from completing the error codepath