diff --git a/.Rbuildignore b/.Rbuildignore
index 8b032d90..13be9a94 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -17,7 +17,7 @@
 ^vignettes/figure/.*$
 ^appveyor\.yml$
 rx_.*\.(so|dll)$
-.*\.(o|a|dll)$
+.*\.(o|a|dll|so)$
 testthat/.*\.(so|dll)$
 BinaryFiles$
 ^/?inst/Install-windows.md
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
index 7834d6ef..6c015c42 100644
--- a/CRAN-SUBMISSION
+++ b/CRAN-SUBMISSION
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-Version: 2.1.8
-Date: 2023-10-08 03:07:32 UTC
-SHA: afe17d29dbf424dc8fc34ffdc353472c28d22092
-=======
-Version: 2.1.7
-Date: 2023-09-18 18:47:54 UTC
-SHA: 18754627a79a28e14084b60374bba21452116d93
->>>>>>> main
+Version: 2.2.2
+Date: 2024-05-28 17:02:22 UTC
+SHA: 76a1d1d71faf8cc70d3590b781bf55ed50bd658d
diff --git a/cran-comments.md b/cran-comments.md
index 355f5b8c..63c9326a 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1,4 +1,3 @@
 # CRAN Comments
 
-- Versiom bump (exactly the same for v2.1.8) to fix binary linkages of
-  nlmixr2est to rxode2 (just released 2.0.14)
+- Bug fixes and version to support new rxode2