diff --git a/supernova.be0 b/supernova.be0
index e40f3cb65..2a8b34dac 100755
--- a/supernova.be0
+++ b/supernova.be0
@@ -2,10 +2,17 @@
 
 #export BEE_TMP_TMPDIR=/scratch/local2 BEE_TMP_BUILDROOT=/scratch/local2/bee-root BEE_MAKEFLAGS='-j80'
 
+<<<<<<< HEAD
 # BEE_VERSION supernova-115.11.0-0
 
 #SRCURL[0]="https://ftp.mozilla.org/pub/thunderbird/releases/${PKGVERSION}/source/thunderbird-${PKGVERSION}.source.tar.xz"
 SRCURL[0]="https://beehive.molgen.mpg.de/3cbc8105c9b7bd7f670da256155b7f5f/thunderbird-115.11.0.source.tar.xz"
+=======
+# BEE_VERSION supernova-115.13.0-0
+
+#SRCURL[0]="https://ftp.mozilla.org/pub/thunderbird/releases/${PKGVERSION}/source/thunderbird-${PKGVERSION}.source.tar.xz"
+SRCURL[0]="https://beehive.molgen.mpg.de/ca160347418afd6ea6bd15b518d3b6e5/thunderbird-115.13.0.source.tar.xz"
+>>>>>>> ae9f4adb (Supernova: Update to version 115.13.0)
 
 # build_in_sourcedir