diff --git a/README.md b/README.md
index f00dfee..5d9829e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Resources gathering tool
+=======
+# synf-sys
+>>>>>>> 1095ca1 (added the device file)
 
 System information retrieval software for synf.
 
@@ -8,3 +12,7 @@ helps users throuble shoot performance issues and do general checkups on devices
 The system code is written in C and will be imported in the backend through cgo.
 
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 1095ca1 (added the device file)
diff --git a/source/device.c b/source/device.c
new file mode 100644
index 0000000..1dcc33b
--- /dev/null
+++ b/source/device.c
@@ -0,0 +1,23 @@
+/*
+ * =====================================================================================
+ *
+ *       Filename:  device.c
+ *
+ *    Description:  
+ *
+ *        Version:  1.0
+ *        Created:  07/17/25 23:14:35
+ *       Revision:  none
+ *       Compiler:  gcc
+ *
+ *         Author:  YOUR NAME (), 
+ *   Organization:  
+ *
+ * =====================================================================================
+ */
+#include <stdlib.h>
+
+int main() {
+    return 0;
+}
+
diff --git a/source/lib/linux/disk.c b/source/lib/linux/disk.c
index c62d840..aeb83bb 100644
--- a/source/lib/linux/disk.c
+++ b/source/lib/linux/disk.c
@@ -21,9 +21,17 @@
 #include <IOKit/IOKitLib.h>
 #include <CoreFoundation/CoreFoundation.h>
 
+<<<<<<< HEAD:source/lib/linux/disk.c
 
 typedef struct {
     long size; 
+=======
+void disk_size();
+
+
+typedef struct {
+    long total_disk_size; 
+>>>>>>> 1095ca1 (added the device file):source/disk.c
 } disk;