amended the failed merge