diff --git a/Bash_Scripting b/Bash_Scripting
new file mode 160000
index 0000000..3b2af3e
--- /dev/null
+++ b/Bash_Scripting
@@ -0,0 +1 @@
+Subproject commit 3b2af3e5cc30f43a75e78601a900ba0a9b4bfc2a
diff --git a/README.md b/README.md
index 5ceff8d..3d9def9 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,6 @@
+<<<<<<< HEAD
 # ne trebe randuri noi
+=======
+# test_git
+
+>>>>>>> parent of 9c67d56 (first commit)