Failed merge reverted