diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5e4852a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*l.txt
+
+
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/vegetable.txt b/vegetable.txt
index 5120afb..d207dcb 100644
--- a/vegetable.txt
+++ b/vegetable.txt
@@ -1 +1,5 @@
- potato, cucumber, tomato.garlic и onion;
\ No newline at end of file
+<<<<<<< HEAD
+ potato, cucumber, tomato.garlic и onion;
+=======
+ boiled potato, fresh cucumber, fried tomato
+>>>>>>> modern