diff --git a/dane.txt b/dane.txt
index 87317e5..62c74a0 100644
--- a/dane.txt
+++ b/dane.txt
@@ -1,2 +1,6 @@
 Adam Wereszczyński
+<<<<<<< HEAD
 Uniwersytet im. Adama Mickiewicza
+=======
+rok akademicki 2021/2022
+>>>>>>> uam
diff --git a/uczelnia/student.txt b/uczelnia/student.txt
new file mode 100644
index 0000000..6d8595e
--- /dev/null
+++ b/uczelnia/student.txt
@@ -0,0 +1 @@
+456663