revert back to before merged