1 files changed, 4 insertions, 0 deletions
diff --git a/index.html b/index.html
index 01a20d36..02c510be 100644
--- a/index.html
+++ b/index.html
@@ -49,7 +49,11 @@
 
 
    <div id="suggestion" >
+<<<<<<< HEAD
        <form> <input id="textanalyser" size="70" placeholder="Type here to create a network:" onkeyup="expand(this);"/></form>
+=======
+       <form> <input id = "textanalyser" size= "70" placeholder = "Type here to create a network:" onkeyup = "expand(this);"/></form>
+>>>>>>> #62
     </div>
 
     <div class="typeselection">