@@ -1,8 +1,17 @@
<html>
<head>
+<<<<<<< HEAD
<title> second change </title>
</head>
<body>
+=======
+ <title>
+ changed
+ </title>
+ </head>
+ <body>
+ <h1> super changed </h1>
+>>>>>>> master
</body>
</html>
