fix changelog and remove unnecessary comment

CHANGELOG.md

@@ -27,19 +27,13 @@ should change the heading of the (upcoming) version to include a major version b
 
 - Fixed issue with formData not updating when dependencies change, fixing [#4325](https://github.com/rjsf-team/react-jsonschema-form/issues/4325)
 - Fixed issue with assigning default values to formData with deeply nested required properties, fixing [#4399](https://github.com/rjsf-team/react-jsonschema-form/issues/4399)
-<<<<<<< HEAD
 - Fixed issue error message will not be cleared after the controlled Form formData is changed. Fixes [#4426](https://github.com/rjsf-team/react-jsonschema-form/issues/4426)
 - Fix for AJV [$data](https://ajv.js.org/guide/combining-schemas.html#data-reference) reference in const property in schema treated as default/const value. The issue is mentioned in [#4361](https://github.com/rjsf-team/react-jsonschema-form/issues/4361).
+- Switched uses of `lodash.isEqual()` to `@rjsf/utils.deepEquals`.
 
 ## @rjsf/validator-ajv8
 
 - Partially fixed issue where dependency errors do not show `title` or `ui:title`. This fix only applicable if we use an ajv-i18n localizer. Ref. [#4402](https://github.com/rjsf-team/react-jsonschema-form/issues/4402).
-=======
-- Switched uses of `lodash.isEqual()` to `@rjsf/utils.deepEquals` at precompiledValidator.
->>>>>>> cc8d4aae (switch lodash.isEqual to @rjsf/utils.deepEquals at utils package)
-
-## @rjsf/validator-ajv8
-
 - Switched uses of `lodash.isEqual()` to `@rjsf/utils.deepEquals` at precompiledValidator.
 
 # 5.23.2

packages/utils/src/enumOptionsDeselectValue.ts

@@ -1,5 +1,3 @@
-// import isEqual from 'lodash/isEqual';
-
 import { EnumOptionsType, RJSFSchema, StrictRJSFSchema } from './types';
 import enumOptionsValueForIndex from './enumOptionsValueForIndex';
 import deepEquals from './deepEquals';

packages/utils/src/schema/getDefaultFormState.ts

@@ -34,7 +34,6 @@ import isMultiSelect from './isMultiSelect';
 import isSelect from './isSelect';
 import retrieveSchema, { resolveDependencies } from './retrieveSchema';
 import isConstant from '../isConstant';
-import { JSONSchema7Object } from 'json-schema';
 import constIsAjvDataReference from '../constIsAjvDataReference';
 import optionsList from '../optionsList';
 import deepEquals from '../deepEquals';