merged and fixed conflict

diff --cc src/test.cc
index b037c80846dcd16d3850d629575ac68c564c56ef,fef23fddc14cbf31f0bf084b1b198c38f8cf76b5..ce8e8ba45f974916c28795f5d177f408ac87f382
--- 1/src/test.cc
--- 2/src/test.cc
+++ b/src/test.cc
@@@ -90,7 -90,7 +90,11 @@@ TEST_CASE("Noder"
  }
  TEST_CASE("Expression")
  {
++<<<<<<< HEAD
 +    // Added another comment
++=======
+     //Added a comment
++>>>>>>> b58fae269fcfa155b9a9dd2c2df54e4f264fb325
      Expression e{"(1+2)^3"};
  }
  TEST_CASE("Memory management")