fix: use assign instead of deprecated merge

addon/mixins/ajax-request.ts

@@ -3,7 +3,7 @@ import EmberError from '@ember/error';
 import Mixin from '@ember/object/mixin';
 import { get } from '@ember/object';
 import { isEmpty } from '@ember/utils';
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import { run } from '@ember/runloop';
 import { warn, runInDebug } from '@ember/debug';
 import Ember from 'ember';
@@ -434,16 +434,15 @@ export default Mixin.create({
    */
   _getFullHeadersHash(headers?: Headers): Headers {
     const classHeaders = get(this, 'headers');
-    const _headers = merge({}, classHeaders);
-    return merge(_headers, headers);
+    return assign({}, classHeaders, headers);
   },
 
   /**
    * Created a normalized set of options from the per-request and
    * service-level settings
    */
   options(url: string, options: AJAXOptions = {}): AJAXOptions {
-    options = merge({}, options);
+    options = assign({}, options);
     options.url = this._buildURL(url, options);
     options.type = options.type || 'GET';
     options.dataType = options.dataType || 'json';

addon/mixins/legacy/normalize-error-response.ts

@@ -1,7 +1,7 @@
 import Mixin from '@ember/object/mixin';
 import { isArray } from '@ember/array';
 import { isNone } from '@ember/utils';
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 
 import isString from '../../-private/utils/is-string';
 import { Headers } from '../../-private/types';
@@ -83,7 +83,7 @@ export default Mixin.create({
     if (isJsonApiErrorResponse(payload)) {
       return payload.errors.map(function(error) {
         if (isObject(error)) {
-          const ret = merge({}, error);
+          const ret = assign({}, error);
           ret.status = `${error.status}`;
           return ret;
         } else {

tests/helpers/start-app.js

@@ -1,12 +1,12 @@
 import Application from '../../app';
 import config from '../../config/environment';
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import { run } from '@ember/runloop';
 
 export default function startApp(attrs) {
-  let attributes = merge({}, config.APP);
+  let attributes = assign({}, config.APP);
   attributes.autoboot = true;
-  attributes = merge(attributes, attrs); // use defaults, but you can override;
+  attributes = assign(attributes, attrs); // use defaults, but you can override;
 
   return run(() => {
     let application = Application.create(attributes);