diff --git a/README.md b/README.md
index 5f428b784..b1f7726ef 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,8 @@
 
 [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis)
 
-<<<<<<< HEAD
+
 Introduction
-=======
-Introduction..
->>>>>>> parent of 357c990... first commit
 ------------
 
 BLIS is a portable software framework for instantiating high-performance