diff --git a/main.cpp b/main.cpp
index 825a782bdbe2f41abf90acca0a4f9ac5c820746d..0ec21eaaabee475b76d6d309d5a097bd5a26f284 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <utility>
 #include <Kokkos_Core.hpp>
 #include "Kokkos_Timer.hpp"
 #include <cassert>
@@ -30,7 +31,7 @@ inline void check_bounds(int i1, int i2, int i3, int n1, int n2, int n3) {
 
 void scenario_1(double* array, int nblocks, int nlev, int nproma, bool print=true) {
     if(print)
-        std::cout << "Default layout; view(array, nblocks, nlev, nproma); d_view(jb, jk, jc) ----- " << std::endl;
+        std::cout << "scenario 1: Default layout; view(array, nblocks, nlev, nproma); d_view(jb, jk, jc) ----- " << std::endl;
 
     Kokkos::View<double***, Kokkos::HostSpace, Kokkos::MemoryUnmanaged> view(array, nblocks, nlev, nproma);
 
@@ -58,7 +59,11 @@ void scenario_1(double* array, int nblocks, int nlev, int nproma, bool print=tru
 
 void scenario_2(double* array, int nblocks, int nlev, int nproma, bool print=true) {
     if(print)
+<<<<<<< HEAD
         std::cout << "Right layout; view(array, nproma, nlev, nblocks); d_view(jc, jk, jb) ----- " << std::endl;
+=======
+        std::cout << "scenario 2: Right layout; view(array, nproma, nlev, nblocks); d_view(jc, jk, jb) ----- " << std::endl;
+>>>>>>> cb80ea4 (add scenario 5; fix wrong prints)
 
     Kokkos::View<double***, Kokkos::LayoutRight, Kokkos::HostSpace, Kokkos::MemoryUnmanaged> view(array, nproma, nlev, nblocks);
  
@@ -87,7 +92,7 @@ void scenario_2(double* array, int nblocks, int nlev, int nproma, bool print=tru
 
 void scenario_2b(double* array, int nblocks, int nlev, int nproma, bool print=true) {
     if(print)
-        std::cout << "Right 2b layout; view(array, nblocks, nlev, nproma); d_view(jb, jk, jc) ----- " << std::endl;
+        std::cout << "scenario 2b: Right 2b layout; view(array, nblocks, nlev, nproma); d_view(jb, jk, jc) ----- " << std::endl;
 
     Kokkos::View<double***, Kokkos::LayoutRight, Kokkos::HostSpace, Kokkos::MemoryUnmanaged> view(array, nblocks, nlev, nproma);
  
@@ -118,7 +123,7 @@ void scenario_2b(double* array, int nblocks, int nlev, int nproma, bool print=tr
 void scenario_3(double* array, int nblocks, int nlev, int nproma, bool print=true) {
 
     if(print)
-        std::cout << "Left layout; view(array, nproma, nlev, nblocks); d_view(jc, jk, jb) ----- " << std::endl;
+        std::cout << "scenario 3: Left layout; view(array, nproma, nlev, nblocks); d_view(jc, jk, jb) ----- " << std::endl;
 
     Kokkos::View<double***, Kokkos::LayoutLeft, Kokkos::HostSpace, Kokkos::MemoryUnmanaged> view(array, nproma, nlev, nblocks);
  
@@ -147,7 +152,7 @@ void scenario_3(double* array, int nblocks, int nlev, int nproma, bool print=tru
 void scenario_4(double* array, int nblocks, int nlev, int nproma, bool print=true) {
 
     if(print)
-        std::cout << "Default layout; view(array, nproma, nlev, nblocks); d_view(jc, jk, jb) ----- " << std::endl;
+        std::cout << "scenario 4: Default layout; view(array, nproma, nlev, nblocks); d_view(jc, jk, jb) ----- " << std::endl;
 
     Kokkos::View<double***, Kokkos::HostSpace, Kokkos::MemoryUnmanaged> view(array, nproma, nlev, nblocks);