chore(merge): fix a merge issue

Author: christianalfoni

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

@@ -1,5 +1,3 @@
-import 'proxy-state-tree'
-
 import {
   ENVIRONMENT,
   EventType,
@@ -9,11 +7,6 @@ import {
   Overmind,
   OvermindMock,
 } from 'overmind'
-<<<<<<< HEAD
-import { IMutationCallback } from 'proxy-state-tree'
-=======
-import 'proxy-state-tree'
->>>>>>> 74c7ada... feat(overmind-react): conform to new typing, remove old connect and useOvermind hook
 import * as react from 'react'
 import {
   unstable_cancelCallback,