resolve conflicts.

Author: sainthkh

packages/driver/src/cy/assertions.ts

@@ -514,7 +514,7 @@ export const create = (Cypress, cy) => {
     },
 
     assert (...args) {
-      // if we've temporarily overriden assertions
+      // if we've temporarily overridden assertions
       // then just bail early with this function
       const fn = cy.state('overrideAssert') || assertFn
 

packages/driver/src/cy/retries.ts

@@ -99,7 +99,7 @@ export const create = (Cypress, state, timeout, clearTimeout, whenStable, finish
       // are not and the retry code is happening between
       // runnables which is bad likely due to the issue below
       //
-      // bug in bluebird with not propagating cancelations
+      // bug in bluebird with not propagating cancellations
       // fast enough in a series of promises
       // https://github.com/petkaantonov/bluebird/issues/1424
       return state('canceled') || state('error') || runnableHasChanged()

packages/driver/src/cypress/cy.ts

@@ -10,6 +10,7 @@ import $dom from '../dom'
 import $utils from './utils'
 import $errUtils from './error_utils'
 import $stackUtils from './stack_utils'
+
 import { create as createChai, IChai } from '../cy/chai'
 import { create as createXhr, IXhr } from '../cy/xhrs'
 import { create as createJQuery, IJQuery } from '../cy/jquery'
@@ -33,8 +34,6 @@ import { $Command } from './command'
 import $CommandQueue from './command_queue'
 import { initVideoRecorder } from '../cy/video-recorder'
 import { TestConfigOverride } from '../cy/testConfigOverrides'
-import debugFn from 'debug'
-import { registerFetch } from 'unfetch'
 
 const debugErrors = debugFn('cypress:driver:errors')