diff --git a/lib/plots.py b/lib/plots.py
index 5a04a8b..e4afb57 100755
--- a/lib/plots.py
+++ b/lib/plots.py
@@ -134,12 +134,21 @@ def display_parameters(E,L,sma,ecc,parameters,savename=""):
 
     fig3 = plt.figure(figsize=(15,7))
     ax3 = fig3.add_subplot(111)
-    ax3.plot(np.arange(sma[-1].shape[0])*step[-1]/yr, sma[i], label="a (step of {0:.2e}s)".format(step[-1]))
-    ax3.plot(np.arange(ecc[-1].shape[0])*step[-1]/yr, ecc[i], label="e (step of {0:.2e}s)".format(step[-1]))
+    ax3.plot(np.arange(sma[-1].shape[0])*step[-1]/yr, sma[-1], label="a (step of {0:.2e}s)".format(step[-1]))
+    ax3.plot(np.arange(ecc[-1].shape[0])*step[-1]/yr, ecc[-1], label="e (step of {0:.2e}s)".format(step[-1]))
     ax3.set(xlabel=r"$t \, [yr]$", ylabel=r"$a \, [au] \, or \, e$")
     ax3.legend()
     fig3.suptitle("Semi major axis and eccentricity "+title2)
     fig3.savefig("plots/{0:s}a_e.png".format(savename),bbox_inches="tight")
 
+    fig4 = plt.figure(figsize=(15,7))
+    ax4 = fig4.add_subplot(111)
+    for i in range(len(E)):
+        ax4.plot(np.arange(E[i].shape[0])*step[-1]/yr, E[i], label="step of {0:.2e}s".format(step[i]))
+    ax4.set(xlabel=r"$t \, [yr]$", ylabel=r"$E \, [J]$")
+    ax4.legend()
+    fig4.suptitle("Mechanical energy of the whole system "+title2)
+    fig4.savefig("plots/{0:s}E.png".format(savename),bbox_inches="tight")
+    
     plt.show(block=True)
   
\ No newline at end of file
diff --git a/main.py b/main.py
index be8b0c3..2ef5b0d 100755
--- a/main.py
+++ b/main.py
@@ -14,7 +14,11 @@ def main():
     m = np.array([1., 1., 1e-1],dtype=np.longdouble)*Ms/Ms  # Masses in Solar mass
     a = np.array([1., 1., 5.],dtype=np.longdouble)*au/au   # Semi-major axis in astronomical units
     e = np.array([0., 0., 0.],dtype=np.longdouble)   # Eccentricity
+<<<<<<< HEAD
     psi = np.array([0., 0., 80.],dtype=np.longdouble)*np.pi/180.    # Inclination of the orbital plane in degrees
+=======
+    psi = np.array([0., 0., 0.],dtype=np.longdouble)*np.pi/180.    # Inclination of the orbital plane in degrees
+>>>>>>> 22fa187 (add Energy display)
 
     x1 = np.array([0., -1., 0.],dtype=np.longdouble)*a[0]*(1.+e[0])
     x2 = np.array([0., 1., 0.],dtype=np.longdouble)*a[1]*(1.+e[1])