Rename merge to deepMerge so it's more clear what it's doing

test/javascripts/lib/pretty-text-test.js

@@ -8,7 +8,7 @@ import {
 } from "pretty-text/inline-oneboxer";
 import { extractDataAttribute } from "pretty-text/engines/discourse-markdown-it";
 import { registerEmoji } from "pretty-text/emoji";
-import { merge } from "discourse-common/lib/object";
+import { deepMerge } from "discourse-common/lib/object";
 
 QUnit.module("lib:pretty-text");
 
@@ -39,7 +39,7 @@ QUnit.assert.cooked = function(input, expected, message) {
 };
 
 QUnit.assert.cookedOptions = function(input, opts, expected, message) {
-  const merged = merge({}, rawOpts, opts);
+  const merged = deepMerge({}, rawOpts, opts);
   const actual = new PrettyText(buildOptions(merged)).cook(input);
   this.pushResult({
     result: actual === expected,

test/javascripts/models/post-test.js

@@ -1,12 +1,12 @@
 import Post from "discourse/models/post";
 import User from "discourse/models/user";
-import { merge } from "discourse-common/lib/object";
+import { deepMerge } from "discourse-common/lib/object";
 
 QUnit.module("model: Post");
 
 var buildPost = function(args) {
   return Post.create(
-    merge(
+    deepMerge(
       {
         id: 1,
         can_delete: true,