diff --git a/README.md b/README.md
index 7142a1329..5f428b784 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,11 @@
 
 [![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