diff --git a/test_conformance/gl/test_buffers.cpp b/test_conformance/gl/test_buffers.cpp
index c66428526d..043bdc83a1 100644
--- a/test_conformance/gl/test_buffers.cpp
+++ b/test_conformance/gl/test_buffers.cpp
@@ -164,8 +164,11 @@ int test_buffer_kernel(cl_context context, cl_command_queue queue,
 
     /* Generate some almost-random input data */
     gen_input_data(vecType, vecSize * numElements, d, inData.data());
+<<<<<<< HEAD
     std::fill(outDataCL.begin(), outDataCL.end(), 0);
     std::fill(outDataGL.begin(), outDataGL.end(), 0);
+=======
+>>>>>>> 8f9f8e0 (Fix build errors related with variable defined array length and gl tests logged error)
 
     /* Generate some GL buffers to go against */
     glGenBuffers(1, &inGLBuffer);
diff --git a/test_conformance/relationals/test_shuffles.cpp b/test_conformance/relationals/test_shuffles.cpp
index 6efa9d8d20..e967717cce 100644
--- a/test_conformance/relationals/test_shuffles.cpp
+++ b/test_conformance/relationals/test_shuffles.cpp
@@ -623,7 +623,6 @@ int test_shuffle_dual_kernel(cl_context context, cl_command_queue queue,
     std::vector<cl_long> inSecondData(inVecSize * numOrders);
     std::vector<cl_long> outData(outRealVecSize * numOrders);
 
-    outData.clear();
     generate_random_data(vecType, (unsigned int)(numOrders * inVecSize), d,
                          inData.data());
     if( shuffleMode == kBuiltInDualInputFnMode )