diff --git a/b/Blender/Blender-3.1.0-GCC-10.3.0.eb b/b/Blender/Blender-3.1.0-GCC-10.3.0.eb
index 9f0fd081..944191f6 100644
--- a/b/Blender/Blender-3.1.0-GCC-10.3.0.eb
+++ b/b/Blender/Blender-3.1.0-GCC-10.3.0.eb
@@ -14,7 +14,11 @@ toolchain = {'name': 'GCC', 'version': '10.3.0'}
 
 source_urls = ['https://ftp.nluug.nl/pub/graphics/blender/release/Blender3.1/']
 sources = ['blender-%(version)s-linux-x64.tar.xz']
+<<<<<<< HEAD
 checksums = ['8cf60d0c2cbda2ad26d8ff65e54cce45']
+=======
+checksums = ['ced2aaabc75731c2ae0e29493d0d2db7803d2bbb70a11cd0e7f50546d465bd8c']
+>>>>>>> f9b20a6876de43df220c97513f83ee10c203bb30
 
 postinstallcmds = [
 	'ml CUDAcore;"nvcc" -arch=sm_80 --cubin "%(installdir)s/3.1/scripts/addons/cycles/source/kernel/device/cuda/kernel.cu" -o "%(installdir)s/3.1/scripts/addons/cycles/lib/kernel_sm_80.cubin" -m64 --ptxas-options="-v" --use_fast_math -DNVCC -I"%(installdir)s/3.1/scripts/addons/cycles/source" -DWITH_NANOVDB',