revert weird merge