diff --git a/README.md b/README.md
index d278df7a3747b1922f4b7b7fd419eb042b03f4e3..ab91d4a80a17484bdd8ca2ed62be556bd0fc8a43 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # BambangShop Publisher App
 Tutorial and Example for Advanced Programming 2024 - Faculty of Computer Science, Universitas Indonesia
 
@@ -196,4 +195,3 @@ For open source projects, say how it is licensed.
 
 ## Project status
 If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
->>>>>>> 75fa48d8cf76a70ea1994edf37ceb974cece2359