diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/api.R b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/api.R
index e3b2958844c896e7aee612d94c3b6516e7e59345..40130fd38468b1924916fd170d46b650c0325a89 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/api.R
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/api.R
@@ -23,22 +23,9 @@
 # All the generated files in testrffi can be regenerated by running 'mx testrfficodegen'
 # R wrappers for all the generated RFFI C wrappers
 
-<<<<<<< HEAD
-api.OBJECT <- function(...) .Call(C_api_OBJECT, ...)
-api.Rf_qnt <- function(...) .Call(C_api_Rf_qnt, ...)
-api.Rf_dwilcox <- function(...) .Call(C_api_Rf_dwilcox, ...)
-api.Rf_qtukey <- function(...) .Call(C_api_Rf_qtukey, ...)
-api.Rf_ptukey <- function(...) .Call(C_api_Rf_ptukey, ...)
-api.Rf_pwilcox <- function(...) .Call(C_api_Rf_pwilcox, ...)
-api.Rf_qwilcox <- function(...) .Call(C_api_Rf_qwilcox, ...)
-api.Rf_rwilcox <- function(...) .Call(C_api_Rf_rwilcox, ...)
-api.Rf_dsignrank <- function(...) .Call(C_api_Rf_dsignrank, ...)
-=======
->>>>>>> Update copyrights
 api.Rf_ScalarInteger <- function(...) .Call(C_api_Rf_ScalarInteger, ...)
 api.Rf_ScalarLogical <- function(...) .Call(C_api_Rf_ScalarLogical, ...)
 api.Rf_ScalarReal <- function(...) .Call(C_api_Rf_ScalarReal, ...)
-api.Rf_cons <- function(...) .Call(C_api_Rf_cons, ...)
 api.Rf_ScalarString <- function(...) .Call(C_api_Rf_ScalarString, ...)
 api.Rf_asInteger <- function(...) .Call(C_api_Rf_asInteger, ...)
 api.Rf_asReal <- function(...) .Call(C_api_Rf_asReal, ...)
@@ -71,14 +58,14 @@ api.Rf_errorcall <- function(...) .Call(C_api_Rf_errorcall, ...)
 api.Rf_allocVector <- function(...) .Call(C_api_Rf_allocVector, ...)
 api.Rf_allocArray <- function(...) .Call(C_api_Rf_allocArray, ...)
 api.Rf_allocMatrix <- function(...) .Call(C_api_Rf_allocMatrix, ...)
+api.Rf_nrows <- function(...) .Call(C_api_Rf_nrows, ...)
 api.Rf_ncols <- function(...) .Call(C_api_Rf_ncols, ...)
 api.LENGTH <- function(...) .Call(C_api_LENGTH, ...)
 api.SET_STRING_ELT <- function(...) .Call(C_api_SET_STRING_ELT, ...)
-api.LEVELS <- function(...) .Call(C_api_LEVELS, ...)
-api.Rf_nrows <- function(...) .Call(C_api_Rf_nrows, ...)
 api.SETLENGTH <- function(...) .Call(C_api_SETLENGTH, ...)
 api.SET_TRUELENGTH <- function(...) .Call(C_api_SET_TRUELENGTH, ...)
 api.TRUELENGTH <- function(...) .Call(C_api_TRUELENGTH, ...)
+api.LEVELS <- function(...) .Call(C_api_LEVELS, ...)
 api.SETLEVELS <- function(...) .Call(C_api_SETLEVELS, ...)
 api.SET_VECTOR_ELT <- function(...) .Call(C_api_SET_VECTOR_ELT, ...)
 api.SET_ATTRIB <- function(...) .Call(C_api_SET_ATTRIB, ...)
@@ -253,6 +240,14 @@ api.Rf_pnf <- function(...) .Call(C_api_Rf_pnf, ...)
 api.Rf_qnf <- function(...) .Call(C_api_Rf_qnf, ...)
 api.Rf_dnt <- function(...) .Call(C_api_Rf_dnt, ...)
 api.Rf_pnt <- function(...) .Call(C_api_Rf_pnt, ...)
+api.Rf_qnt <- function(...) .Call(C_api_Rf_qnt, ...)
+api.Rf_ptukey <- function(...) .Call(C_api_Rf_ptukey, ...)
+api.Rf_qtukey <- function(...) .Call(C_api_Rf_qtukey, ...)
+api.Rf_dwilcox <- function(...) .Call(C_api_Rf_dwilcox, ...)
+api.Rf_pwilcox <- function(...) .Call(C_api_Rf_pwilcox, ...)
+api.Rf_qwilcox <- function(...) .Call(C_api_Rf_qwilcox, ...)
+api.Rf_rwilcox <- function(...) .Call(C_api_Rf_rwilcox, ...)
+api.Rf_dsignrank <- function(...) .Call(C_api_Rf_dsignrank, ...)
 api.Rf_psignrank <- function(...) .Call(C_api_Rf_psignrank, ...)
 api.Rf_qsignrank <- function(...) .Call(C_api_Rf_qsignrank, ...)
 api.Rf_rsignrank <- function(...) .Call(C_api_Rf_rsignrank, ...)
@@ -274,9 +269,6 @@ api.Rf_bessel_y <- function(...) .Call(C_api_Rf_bessel_y, ...)
 api.Rf_sign <- function(...) .Call(C_api_Rf_sign, ...)
 api.Rf_fprec <- function(...) .Call(C_api_Rf_fprec, ...)
 api.Rf_ftrunc <- function(...) .Call(C_api_Rf_ftrunc, ...)
-api.Rf_cospi <- function(...) .Call(C_api_Rf_cospi, ...)
-api.Rf_sinpi <- function(...) .Call(C_api_Rf_sinpi, ...)
-api.Rf_tanpi <- function(...) .Call(C_api_Rf_tanpi, ...)
 api.Rf_namesgets <- function(...) .Call(C_api_Rf_namesgets, ...)
 api.Rf_copyMostAttrib <- function(...) .Call(C_api_Rf_copyMostAttrib, ...)
 api.Rf_VectorToPairList <- function(...) .Call(C_api_Rf_VectorToPairList, ...)
@@ -285,9 +277,6 @@ api.Rf_match <- function(...) .Call(C_api_Rf_match, ...)
 api.Rf_NonNullStringMatch <- function(...) .Call(C_api_Rf_NonNullStringMatch, ...)
 api.R_has_slot <- function(...) .Call(C_api_R_has_slot, ...)
 api.Rf_PrintValue <- function(...) .Call(C_api_Rf_PrintValue, ...)
-<<<<<<< HEAD
 api.R_nchar <- function(...) .Call(C_api_R_nchar, ...)
 api.Rf_isObject <- function(...) .Call(C_api_Rf_isObject, ...)
-=======
 api.OBJECT <- function(...) .Call(C_api_OBJECT, ...)
->>>>>>> Update copyrights
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/init_api.h b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/init_api.h
index 6825e95c38e07f07063b438082e81e5b3d0af056..bdf6076250de3e962d8ef69632d4d681d599dfaa 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/init_api.h
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/init_api.h
@@ -27,8 +27,6 @@
 // The definitions of the C functions could be generated by the same Java class (but run without any option)
 // RFFI functions that take/return C pointers are ignored
 // This code is '#included' into init.c 
-CALLDEF(api_OBJECT, 1),
-CALLDEF(api_Rf_cons, 2),
 CALLDEF(api_Rf_ScalarInteger, 1),
 CALLDEF(api_Rf_ScalarLogical, 1),
 CALLDEF(api_Rf_ScalarReal, 1),
@@ -275,9 +273,6 @@ CALLDEF(api_Rf_bessel_y, 2),
 CALLDEF(api_Rf_sign, 1),
 CALLDEF(api_Rf_fprec, 2),
 CALLDEF(api_Rf_ftrunc, 1),
-CALLDEF(api_Rf_cospi, 1),
-CALLDEF(api_Rf_sinpi, 1),
-CALLDEF(api_Rf_tanpi, 1),
 CALLDEF(api_Rf_namesgets, 2),
 CALLDEF(api_Rf_copyMostAttrib, 2),
 CALLDEF(api_Rf_VectorToPairList, 1),
@@ -288,4 +283,5 @@ CALLDEF(api_R_has_slot, 2),
 CALLDEF(api_Rf_PrintValue, 1),
 CALLDEF(api_R_nchar, 5),
 CALLDEF(api_Rf_isObject, 1),
+CALLDEF(api_OBJECT, 1),
 // ---- end of generated code
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.c b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.c
index 55cbc25d8a1be95335777e893cfcca278f510c27..83a8897688e32615308e493e0ade43ab9debb645 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.c
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.c
@@ -43,22 +43,14 @@
 
 #pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
 
-SEXP api_OBJECT(SEXP x) {
-    return ScalarInteger(OBJECT(x));
+SEXP api_Rf_ScalarInteger(SEXP value) {
+    return Rf_ScalarInteger(INTEGER_VALUE(value));
 }
 
 SEXP api_Rf_ScalarLogical(SEXP value) {
     return Rf_ScalarLogical(INTEGER_VALUE(value));
 }
 
-SEXP api_Rf_cons(SEXP car, SEXP cdr) {
-    return Rf_cons(car, cdr);
-}
-
-SEXP api_Rf_ScalarInteger(SEXP value) {
-    return Rf_ScalarInteger(INTEGER_VALUE(value));
-}
-
 SEXP api_Rf_ScalarReal(SEXP value) {
     return Rf_ScalarReal(NUMERIC_VALUE(value));
 }
@@ -215,11 +207,8 @@ SEXP api_SET_STRING_ELT(SEXP x, SEXP i, SEXP v) {
 }
 
 SEXP api_SETLENGTH(SEXP x, SEXP l) {
-    return ScalarInteger(SETLENGTH(x, INTEGER_VALUE(l)));
-}
-
-SEXP api_SETTRUELENGTH(SEXP x, SEXP l) {
-    return ScalarInteger(SETTRUELENGTH(x, INTEGER_VALUE(l)));
+    SETLENGTH(x, INTEGER_VALUE(l));
+    return R_NilValue;
 }
 
 SEXP api_SET_TRUELENGTH(SEXP x, SEXP l) {
@@ -1075,18 +1064,6 @@ SEXP api_Rf_ftrunc(SEXP a) {
     return ScalarReal(Rf_ftrunc(NUMERIC_VALUE(a)));
 }
 
-SEXP api_Rf_cospi(SEXP a) {
-    return ScalarReal(Rf_cospi(NUMERIC_VALUE(a)));
-}
-
-SEXP api_Rf_sinpi(SEXP a) {
-    return ScalarReal(Rf_sinpi(NUMERIC_VALUE(a)));
-}
-
-SEXP api_Rf_tanpi(SEXP a) {
-    return ScalarReal(Rf_tanpi(NUMERIC_VALUE(a)));
-}
-
 SEXP api_Rf_namesgets(SEXP vec, SEXP val) {
     return Rf_namesgets(vec, val);
 }
@@ -1122,12 +1099,16 @@ SEXP api_Rf_PrintValue(SEXP value) {
 }
 
 SEXP api_R_nchar(SEXP string, SEXP type, SEXP allowNA, SEXP keepNA, SEXP msgName) {
-    return ScalarInteger(R_nchar(R_CHAR(STRING_ELT(string, 0)), INTEGER_VALUE(type), INTEGER_VALUE(allowNA), INTEGER_VALUE(keepNA), R_CHAR(STRING_ELT(msgName, 0))));
+    return ScalarInteger(R_nchar(string, INTEGER_VALUE(type), INTEGER_VALUE(allowNA), INTEGER_VALUE(keepNA), R_CHAR(STRING_ELT(msgName, 0))));
 }
 
 SEXP api_Rf_isObject(SEXP x) {
     return ScalarInteger(Rf_isObject(x));
 }
 
+SEXP api_OBJECT(SEXP x) {
+    return ScalarInteger(OBJECT(x));
+}
+
 #pragma GCC diagnostic pop
 #pragma GCC diagnostic pop
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.h b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.h
index 0959dd340d3bea2b63e20b1b74ba9bdf6ff76619..b7e552e419a64d04c95be2b36d9068d0832681de 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.h
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/rffiwrappers.h
@@ -38,12 +38,6 @@ SEXP api_Rf_ScalarInteger(SEXP value);
 
 SEXP api_Rf_ScalarLogical(SEXP value);
 
-SEXP api_Rf_cons(SEXP car, SEXP cdr);
-
-SEXP api_Rf_ScalarInteger(SEXP value);
-
-SEXP api_Rf_ScalarLogical(SEXP value);
-
 SEXP api_Rf_ScalarReal(SEXP value);
 
 SEXP api_Rf_ScalarString(SEXP value);
@@ -532,12 +526,6 @@ SEXP api_Rf_fprec(SEXP a, SEXP b);
 
 SEXP api_Rf_ftrunc(SEXP a);
 
-SEXP api_Rf_cospi(SEXP a);
-
-SEXP api_Rf_sinpi(SEXP a);
-
-SEXP api_Rf_tanpi(SEXP a);
-
 SEXP api_Rf_namesgets(SEXP vec, SEXP val);
 
 SEXP api_Rf_copyMostAttrib(SEXP x, SEXP y);
@@ -558,3 +546,5 @@ SEXP api_R_nchar(SEXP string, SEXP type, SEXP allowNA, SEXP keepNA, SEXP msgName
 
 SEXP api_Rf_isObject(SEXP x);
 
+SEXP api_OBJECT(SEXP x);
+