Revoking previous merge hack