revert merge issue