merge reverted