diff --git a/pm4py/meta.py b/pm4py/meta.py
index ce743ce20..f291398fa 100644
--- a/pm4py/meta.py
+++ b/pm4py/meta.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 '''
     This file is part of PM4Py (More Info: https://pm4py.fit.fraunhofer.de).