amended merge fail