Conflict fixed on "Object methods, 'this'" page in french language

Author: HachemiH

1-js/04-object-basics/04-object-methods/article.md

@@ -81,11 +81,7 @@ user = {
 // la méthode abrégée semble mieux, non ?
 user = {
 *!*
-<<<<<<< HEAD
-  sayHi() { // identique à "sayHi: function()"
-=======
-  sayHi() { // same as "sayHi: function(){...}"
->>>>>>> 6ab384f2512902d74e4b0ff5a6be60e48ab52e96
+  sayHi() { // identique à "sayHi: function(){...}"
 */!*
     alert("Hello");
   }