From 793c9aacb2debc3aceb7b0f719340e1865e3c98e Mon Sep 17 00:00:00 2001
From: Reonu <danileon95@gmail.com>
Date: Thu, 15 Jul 2021 01:10:17 +0100
Subject: [PATCH] apply_patch creates conflicts instead of rejects

---
 tools/apply_patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/apply_patch.sh b/tools/apply_patch.sh
index 1ab8ed239..31ddfc3a1 100755
--- a/tools/apply_patch.sh
+++ b/tools/apply_patch.sh
@@ -13,7 +13,7 @@ fi
 read -p "Do you wish to apply the patch '$1'? [Y/N] " response
 case "$response" in
     Y|y)
-	patch -p1 < "$1"
+	patch -p1 --merge < "$1"
 	;;
     N|n)
 	echo 'Quit'