diff --git a/source/src/woanware/lookuper/main.go b/source/src/woanware/lookuper/main.go
index 94f1620..270cb1a 100644
--- a/source/src/woanware/lookuper/main.go
+++ b/source/src/woanware/lookuper/main.go
@@ -29,11 +29,7 @@ var (
 // ##### Constants ############################################################
 
 const APP_NAME string = "lookuper"
-<<<<<<< HEAD
 const APP_VERSION string = "0.0.5"
-=======
-const APP_VERSION string = "0.0.4"
->>>>>>> 1d0da74eb00a9757f1c98adcb821d7fdb525d886
 const DB_FILE_NAME string = "./lookuper.db"
 const CONFIG_FILE_NAME string = "./lookuper.config"