diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index 6e49517283da654ffcaa07a163b12f7f59f751fd..bdc0cdf314ceeb346e309d1a37d39832800bdfe5 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -5193,7 +5193,6 @@ class Cases(object):
 
         return int_env
 
->>>>>>> 243fec873030daa39e892a424570111fbeaa9963
     def envelope(self, silent=False, ch_list=[], append=''):
         """
         Calculate envelopes and save them in a table.