diff --git a/src/.config b/src/.config
index 1d74b137e..df73420c1 100644
--- a/src/.config
+++ b/src/.config
@@ -157,14 +157,11 @@ VIM_SOURCE_URL=https://github.com/vim/vim/archive/v8.0.1298.tar.gz
 #
 ZLIB_SOURCE_URL=http://zlib.net/zlib-1.2.11.tar.xz
 
-<<<<<<< HEAD
 # You can find the latest dialog source bundles here:
 #
 #   http://invisible-island.net/dialog/
 #
 DIALOG_SOURCE_URL=ftp://ftp.invisible-island.net/dialog/dialog-1.3-20170509.tgz
-=======
->>>>>>> 54800aa7c24ba11aedb448524c0314c75104bcc3
 
 ####################################################
 #                                                  #