diff --git a/INSTALL.md b/INSTALL.md
index dce4b89..86e3ae3 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -588,4 +588,8 @@ const TLD = 'mynet'
 
 The frontend should work now, though it could use a bit of design work or implementation in your website. 
 
+<<<<<<< HEAD
 That's the whole installation, phew! Take a break. When you come back, start learning how to [use wagon](USAGE.md).
+=======
+That's the whole installation, phew! Take a break. When you come back, start learning how to [use wagon](USAGE.md).
+>>>>>>> c3f34b4 (Finished installation instructions)