From 8c74f526131d93aace3d4f9edf9f4d858b69f9d4 Mon Sep 17 00:00:00 2001
From: Marc Shilling <marcshilling@gmail.com>
Date: Fri, 24 Feb 2017 00:12:17 -0500
Subject: [PATCH] fix name conflict

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 8c968ae60..10416c272 100644
--- a/package.json
+++ b/package.json
@@ -19,11 +19,7 @@
       "email": "yfuks@student.42.fr"
     },
     {
-<<<<<<< HEAD
-      "name": "Alexandr Ustinov",
-=======
       "name": "Alexander Ustinov",
->>>>>>> refactoring
       "email": "rusfearuth@gmail.com"
     }
   ],