rebasing and fixing the conflicts

Author: Saumya-R

tests/cpp_test_scenarios/src/test_basic.cpp

@@ -67,9 +67,6 @@ std::string BasicScenario::name() const { return "basic"; }
 void BasicScenario::run(const std::string &input) const {
   using namespace score::mw::per::kvs;
 
-void BasicScenario::run(const std::string& input) const {
-  using namespace score::mw::per::kvs;
-
   // Print and parse parameters.
   std::cerr << input << std::endl;
   auto params{map_to_params(input)};