diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1dc771a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+mojabaza.sqlite
diff --git a/example.txt b/example.txt
index 8430408..01b6ac3 100644
--- a/example.txt
+++ b/example.txt
@@ -1 +1 @@
-Initial content
+Nekaj sem dodal v example.txt
diff --git a/file.txt b/file.txt
index 6c69b83..1aa1e81 100644
--- a/file.txt
+++ b/file.txt
@@ -1 +1,5 @@
 This is the first change.
+<<<<<<< HEAD
+=======
+This is the second change.
+>>>>>>> cpp