Revert merge issue