diff --git a/README.md b/README.md
index 5ac9636ec..0ca93513d 100644
--- a/README.md
+++ b/README.md
@@ -2577,7 +2577,10 @@ Use `Math.max()` combined with the spread operator (`...`) to get the maximum va
 
 
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> master
 const max = (...arr) => Math.max(...[].concat(...arr);
 ```
 
diff --git a/docs/index.html b/docs/index.html
index b747f7bc9..e3b5151f4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1220,7 +1220,10 @@ lcm([1, 3, 4], 5); // 60
 
 
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> master
 const max = (...arr) =&gt; Math.max(...[].concat(...arr);
 </code></pre>
 <pre><code class="language-js">max([10, 1, 5]); // 10
diff --git a/snippets/max.md b/snippets/max.md
index 9f6bde286..0fe2586b7 100644
--- a/snippets/max.md
+++ b/snippets/max.md
@@ -5,6 +5,10 @@ Returns the maximum value out of two or more numbers/arrays.
 Use `Math.max()` combined with the spread operator (`...`) to get the maximum value in the array.
 
 ```js
+
+
+
+
 const max = (...arr) => Math.max(...[].concat(...arr);
 ```