diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 99a9da7..a004dc5 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2211,13 +2211,8 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idf-im-lib"
-<<<<<<< HEAD
 version = "0.1.8"
 source = "git+https://github.com/espressif/idf-im-lib.git?tag=v0.1.8#395f0f8c72c442054686a08e5d1602c222e6e1f5"
-=======
-version = "0.1.7"
-source = "git+https://github.com/espressif/idf-im-lib.git?rev=3e8b7b095f5e77caa1482169d0e79d522b05f4d5#3e8b7b095f5e77caa1482169d0e79d522b05f4d5"
->>>>>>> 0afb3a5 (EIM-45 basic post install step is added)
 dependencies = [
  "colored",
  "config",
diff --git a/src/App.vue b/src/App.vue
index 7920860..dbc2699 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,7 +9,7 @@
     <global-progress />
     <!-- Footer -->
     <footer class="footer">
-      ESP-IDF Installation Manager v1.0.0 (TODO:INSERT VERSION)
+      ESP-IDF Installation Manager {{ appVersion }}
     </footer>
   </div>
 </template>
@@ -17,14 +17,19 @@
 <script setup>
 import { NConfigProvider, NLayout, NLayoutHeader, NLayoutContent, useOsTheme } from 'naive-ui'
 import { darkTheme } from 'naive-ui'
-import { computed, onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
 import MessageDisplay from './components/MessageDisplay.vue'
 import GlobalProgress from './components/GlobalProgress.vue'
 import { attachConsole } from '@tauri-apps/plugin-log'
+import { getVersion } from '@tauri-apps/api/app';
+
+
 const osTheme = useOsTheme()
 const theme = null // computed(() => (osTheme.value === 'dark' ? darkTheme : null))
+const appVersion = ref('');
 
 onMounted(async () => {
-  const detach = await attachConsole()
+  const detach = await attachConsole();
+  appVersion.value = await getVersion();
 })
 </script>
\ No newline at end of file