diff --git a/index.html b/index.html
index a0f5d05..7160664 100644
--- a/index.html
+++ b/index.html
@@ -79,14 +79,20 @@ <h1> Lets create a collage </h1>
 	<rect x="210" y="110"  height="100" width="100" 
 		style = "stroke:#f11000; fill:#0001ff">
 	</rect>
-	<text x="230" y="160">Student 10 </text>
+	<text x="230" y="160">Jose </text>
 
 
 	<!--Code to be eddited by student 11 start-->
 	<rect x="210" y="210"  height="100" width="100" 
+<<<<<<< HEAD
+		style = "stroke:#0000ff; fill:#00ffff">
+	</rect>
+	<text x="230" y="260">Student </text>
+=======
 		style = "stroke:#ff0000; fill:#00ffff">
 	</rect>
-	<text x="230" y="260">chaitanya </text>
+	<text x="230" y="260">achaitanya </text>
+>>>>>>> cccf1de0e01a7a6db8e54b6bef396514973b39c2