diff --git a/src/storage/datastorage.c b/src/storage/datastorage.c
index 181a2e5..546c29c 100644
--- a/src/storage/datastorage.c
+++ b/src/storage/datastorage.c
@@ -221,7 +221,6 @@ int build_network_overview(struct blob_buf *b)
     }
     return 0;
 }
->>>>>>> master
 
 int eval_probe_metric(struct probe_entry_s probe_entry) {