diff --git a/IDE/Renesas/cs+/Projects/common/wolfssl_dummy.c b/IDE/Renesas/cs+/Projects/common/wolfssl_dummy.c
index 8a777cd4f..3ea7879c2 100644
--- a/IDE/Renesas/cs+/Projects/common/wolfssl_dummy.c
+++ b/IDE/Renesas/cs+/Projects/common/wolfssl_dummy.c
@@ -51,13 +51,9 @@ int strncasecmp(const char *s1, const char * s2, unsigned int sz)
 	}
 	if(toupper(*s1) > toupper(*s2)){
 	    return 1;
-<<<<<<< HEAD
-    return 0;
-=======
 	}
     }
     return 0;	
->>>>>>> Refactor cs+ project
 }
     
 void abort(void) 
diff --git a/tests/api.c b/tests/api.c
index 6de79a498..3cd950c1f 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -749,7 +749,9 @@ static void test_wolfSSL_CTX_load_verify_locations(void)
 #if !defined(NO_WOLFSSL_DIR) && !defined(WOLFSSL_TIRTOS)
     const char* load_certs_path = "./certs/external";
     const char* load_no_certs_path = "./examples";
+#ifndef NO_RSA
     const char* load_expired_path = "./certs/test/expired";
+#endif
 #endif
 
     AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));