diff --git a/README.md b/README.md
index a6c3c4a8d1723bcc00a0c9515e3075de3695f15a..1a1cc0c4cc17d93a0d1b8983f310d8bfade98e8d 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,3 @@
-<link href="main.css" rel="stylesheet"></link>
-
-<<<<<<< HEAD
-this is a test
-added with visual studio code
-
-=======
-second test
->>>>>>> 29cdea93aee39ccb7c2c3cfd7f4c2a9874e7238f
 # Open Lab Starter Kit
 
 [![Gitter](https://badges.gitter.im/fab-city/open-lab-starter-kit.svg)](https://gitter.im/fab-city/open-lab-starter-kit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)