diff --git a/.gitignore b/.gitignore
index 7cb4fe57f0..e5cd6047cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ libretro-super
 run.sh
 convert_rumble.awk
 *~
+assets
 
 # Wii U
 *.depend
diff --git a/Makefile.libnx b/Makefile.libnx
index 566730ecb3..a15b596cde 100644
--- a/Makefile.libnx
+++ b/Makefile.libnx
@@ -41,7 +41,7 @@ HAVE_NETWORKING = 1
 HAVE_NETPLAYDISCOVERY = 1
 HAVE_STB_FONT = 1
 HAVE_CHEEVOS = 1
-HAVE_CHD = 1
+HAVE_CHD = 0 # disabled due to static libretro-common and libchdr conflicts between different cores
 HAVE_STB_VORBIS = 1
 
 # RetroArch libnx useful flags