update index.html resize image

index.html

@@ -12,8 +12,12 @@ style="width:100%;max-width:700px"></div>
 <p>This is the first file in my new Git Repo.</p>
 <p> a new line in our file.</p>
 
+<<<<<<< HEAD
 <div><img src="img_hello_world.jpg" alt="Hello World from Space"
 style="width:100%;max-width:800px"></div>
+=======
+
+>>>>>>> 96d17e54980d37e17b6f7b0988c63b426fd6af48
 
 </body>
 </html> 
\ No newline at end of file