diff --git a/README.md b/README.md
index a8c7b70c07c8ee8a63a42eada91a19e79de61b5f..5d4d52eabed8e48824ffecab7aefe2f0dbb0df7f 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,9 @@ test-project - I edited at Web
 * I want to break free - I edited at oss032@
 * 05031213 - at ssh
 * 05031230 - at pc
+<<<<<<< HEAD
 * 05031254 - at pc edit again
+=======
+* 05031259 - at web
+>>>>>>> 2653afc37f9f3bd97c4f07e5e0f8e72d3aeccf0a
+* 1300 PC에서 합침