merge fail revert