diff --git a/storjstatus/storjstatus_send.py b/storjstatus/storjstatus_send.py
index cc38bdf7d874a426e9f30b2175d2d0b15c85456a..da5c4df45f72ccd28aebd26ffeb4aba7181fe0c5 100644
--- a/storjstatus/storjstatus_send.py
+++ b/storjstatus/storjstatus_send.py
@@ -170,7 +170,6 @@ def config_json():
 
 
 def load_settings():
-<<<<<<< HEAD
     if storjstatus_common.get_os_type() == "win":
         return load_settings_win()
     elif storjstatus_common.get_os_type() == "linux":
@@ -192,8 +191,6 @@ def load_settings_win():
 
 
 def load_settings_linux():
-=======
->>>>>>> c778c9176753976ed977fc2bf64e632f499cdfa3
     global APIKEY
     global APISECRET
     global SERVERGUID
diff --git a/storjstatus/version.py b/storjstatus/version.py
index 0404d81037f66e8dfa8fa4e18458619876f083bc..e1424ed0ecfcae1287e41bd4c49fa6b9f4e3f54d 100644
--- a/storjstatus/version.py
+++ b/storjstatus/version.py
@@ -1 +1 @@
-__version__ = '0.3.0'
+__version__ = '0.3.1'
diff --git a/update-db.py b/update-db.py
index 6be6c35dff1d0fba71194375e15cc0eb0761d950..61b930d1e41c9f7292358dc1afbd6045a366e054 100644
--- a/update-db.py
+++ b/update-db.py
@@ -1,14 +1,14 @@
 import os
-import setuptools
 from crate.client import connect
 
+exec(open('storjstatus/version.py').read())
+
 def main():
-    exec(open('storjstatus/version.py').read())
-    print("Updating database to version " + __VERSION__)
+    print("Updating database to version " + __version__)
 
     connection = connect('data2.jamescoyle.net:4200')
     cursor = connection.cursor()
-    cursor.execute("UPDATE storj.settings SET setting_value = '" + __VERSION__ + "' WHERE setting_name = 'storjstatus-client-version' ")
+    cursor.execute("UPDATE storj.settings SET setting_value = '" + __version__ + "' WHERE setting_name = 'storjstatus-client-version' ")
 
 if __name__ == "__main__":
     main()