diff --git a/README.md b/README.md
index 310d6bc..269a72c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,13 @@ zncstrap
 ========
 
 Modified by casper@LunarBNC for 1.8.2
+<<<<<<< HEAD
 Some things were added and mainly all pages needed i18n as well.
 
 ### Source
-https://github.com/FirrreHQ/zncstrap
\ No newline at end of file
+https://github.com/FirrreHQ/zncstrap
+=======
+
+### Source
+https://github.com/FirrreHQ/zncstrap
+>>>>>>> f5006815042dd5f6109f0e83161ee8c59da0d5ee