revert merge conflict resolved