diff --git a/python-plot-script.py b/python-plot-script.py
index e260a3020f073e32588a79dd6ff5fbbc4bb81d4f..bb3754a01d1abe36addf4d41d92e1ed0471ffcb4 100644
--- a/python-plot-script.py
+++ b/python-plot-script.py
@@ -1,15 +1,38 @@
 import pandas as pd
+<<<<<<< HEAD
 import matplotlib.pyplot as plt
 import os
 import glob
 import math
 user_key = 9649
+=======
+import os
+import glob
+import matplotlib.pyplot as plt
+user_key= 4361
+>>>>>>> python-addon
 
 def plot_all_csv_pressure():
     path = os.getcwd()
     csv_files = glob.glob(os.path.join(path, '*.csv'))
     
+<<<<<<< HEAD
     for f in csv_files:
         storm = pd.read_csv(f)
         storm['Pressure'].plot()
         plt.show()
+=======
+    fr f in csv_files:
+        storm = pd.read_csv(f)
+        storm['Pressure'].plot()
+        plt.show()
+		
+def plot_all_csv_intensity():
+    path = os.getcwd()
+    csv_files = glob.glob(os.path.join(path, '*.csv'))
+    
+    for f in csv_files:
+        storm = pd.read_csv(f)
+        storm['Intensity'].plot()
+        plt.show()
+>>>>>>> python-addon