diff --git a/README.md b/README.md
index 58770e68..9b0dbe5f 100755
--- a/README.md
+++ b/README.md
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-
-
-
-=======
# Flextype

[](https://github.com/flextype/flextype/blob/master/LICENSE.txt)
@@ -45,4 +40,3 @@ composer create-project flextype/flextype
## License
See [LICENSE](https://github.com/flextype/flextype/blob/master/LICENSE.md)
->>>>>>> origin/dev