resolve merge conflicts

Author: Shahidullah-Muffakir

.eslintrc.js

@@ -87,6 +87,15 @@ const restrictedImportPaths = [
         importNames: ['memoize'],
         message: "Please use '@src/libs/memoize' instead.",
     },
+    {
+        name: 'lodash/isEqual',
+        message: "Please use 'deepEqual' from 'fast-equals' instead.",
+    },
+    {
+        name: 'lodash',
+        importNames: ['isEqual'],
+        message: "Please use 'deepEqual' from 'fast-equals' instead.",
+    },
     {
         name: 'react-native-animatable',
         message: "Please use 'react-native-reanimated' instead.",