diff --git a/.gitmodules b/.gitmodules
index 8b570396..fa28a3c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "code/components/esp32-camera-master"]
 	path = code/components/esp32-camera-master
 	url = https://github.com/espressif/esp32-camera.git
+<<<<<<< HEAD
+=======
+[submodule "code/components/esp-nn"]
+	path = code/components/esp-nn
+	url = https://github.com/espressif/esp-nn.git
+[submodule "code/components/tflite-micro-esp-examples"]
+	path = code/components/tflite-micro-esp-examples
+	url = https://github.com/espressif/tflite-micro-esp-examples.git
+>>>>>>> added tflite-lib (resp. tflite-micro-esp-examples) again as submodule (master)
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index c0852a05..880cc5fc 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13.4)
 
-list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
+list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common components/tflite-micro-esp-examples/components/tflite-lib)
 
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp
diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples
new file mode 160000
index 00000000..2a93aa31
--- /dev/null
+++ b/code/components/tflite-micro-esp-examples
@@ -0,0 +1 @@
+Subproject commit 2a93aa3106f181768d75f64bcac629f344a2ca22