diff --git a/build.gradle b/build.gradle
index a87b5ae..231eb48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,11 +13,7 @@ plugins {
 apply plugin: 'net.minecraftforge.gradle.forge'
 
 boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false');
-<<<<<<< Updated upstream
 ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom';
-=======
-ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom'
->>>>>>> Stashed changes
 
 group = 'com.tterrag.blur'
 archivesBaseName = "Blur"