diff --git a/README.md b/README.md
index 31cf956..29909f0 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
--bmaster-003
\ No newline at end of file
+<<<<<<< HEAD
+-bmaster-003
+=======
+-amaster-003
+>>>>>>> 0b221ceeb840b8d77aebe8a3be205aa8e62b856f