diff --git a/README.md b/README.md
index add5ed7..1124644 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 # AVR_ATMEGA_USART
-=======
-# AVR ATMEGA328P USART
 
 ## Description:
 
@@ -14,5 +11,4 @@ is tested and working.
 It's required to set the fuses in the chip for 8Mhz, otherwise a baud rate
 of 9600 will result in errors at a 7% rate.
 
->>>>>>> 6b73f1e (Added a readme file)