diff --git a/README.md b/README.md
index 1521d74..add5ed7 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,18 @@
+<<<<<<< HEAD
 # AVR_ATMEGA_USART
+=======
+# AVR ATMEGA328P USART
+
+## Description:
+
+This is a asynchronous serial program for the ATMEGA seris of mcu. The sotfware
+is tested and working.
+
+
+## ISSUES:
+
+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)