chore(merge): fix merge issues

Author: christianalfoni

package-lock.json

@@ -140,4 +140,4 @@
       "config": ".cz-config.js"
     }
   }
-}
+}

package.json

@@ -541,4 +541,4 @@ export const createConnect: <
       return refForwarder
     }
   }
-}
+}

packages/node_modules/overmind-react/src/index.ts

@@ -176,4 +176,4 @@ export function createConnect<Config extends IConfiguration>(
       overmind,
     } as any
   }
-}
+}

packages/node_modules/overmind-vue/src/index.ts

@@ -3,7 +3,6 @@ import {
   IAction,
   Overmind,
   SERIALIZE,
-  createOvermindMock,
   rehydrate,
 } from './'
 import { namespaced } from './config'
@@ -419,4 +418,4 @@ describe('Overmind', () => {
     changeFoo()
     expect(app.state.foo).toBe('replaced!')
   })
-})
+})

packages/node_modules/overmind/src/index.test.ts

@@ -45,6 +45,7 @@ import {
   IReaction,
 } from './types'
 import {
+  ENVIRONMENT,
   EXECUTION,
   IS_OPERATOR,
   IS_TEST,
@@ -59,7 +60,6 @@ import {
   getFunctionName,
   isPromise,
   processState,
-  ENVIRONMENT,
 } from './utils'
 
 export * from './types'
@@ -1725,4 +1725,4 @@ export function waitUntil<Input, ThisConfig extends IConfiguration = Config>(
       }
     }
   )
-}
+}

packages/node_modules/overmind/src/index.ts

@@ -1,5 +1,6 @@
 import isPlainObject from 'is-plain-obj'
 import { PATH, PROXY_TREE, VALUE } from 'proxy-state-tree'
+
 import { IState } from '.'
 
 type TState = {
@@ -199,4 +200,4 @@ export function statemachine<
       return new StateMachine(transitions, state as any, baseState as any)
     },
   } as any
-}
+}