diff --git a/README.md b/README.md
index a4920f0..0498eb0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # iassistance README
 
 This is the README for your extension "iassistance". After writing up a brief description, we recommend including the following sections.