diff --git a/projects/Random password generator/random_password_gen.py b/projects/Random password generator/random_password_gen.py
index 69abfd43..9acd726e 100644
--- a/projects/Random password generator/random_password_gen.py	
+++ b/projects/Random password generator/random_password_gen.py	
@@ -1,91 +1,43 @@
-import random
-import math
-<<<<<<< HEAD
-alpha = "abcdefghijklmnopqrstuvwxyz"
-num = "0123456789"
-special = "@#$%&*"
-
-# pass_len=random.randint(8,13)  #without User INput
-pass_len = int(input("Enter Password Length"))
-
-# length of password by 50-30-20 formula
-alpha_len = pass_len//2
-num_len = math.ceil(pass_len*30/100)
-special_len = pass_len-(alpha_len+num_len)
-
-
-password = []
-
-
-def generate_pass(length, array, is_alpha=False):
-    for i in range(length):
-        index = random.randint(0, len(array) - 1)
-        character = array[index]
-        if is_alpha:
-            case = random.randint(0, 1)
-            if case == 1:
-                character = character.upper()
-        password.append(character)
-
-
-# alpha password
-generate_pass(alpha_len, alpha, True)
-# numeric password
-generate_pass(num_len, num)
-# special Character password
-generate_pass(special_len, special)
-# suffle the generated password list
-random.shuffle(password)
-# convert List To string
-gen_password = ""
-for i in password:
-    gen_password = gen_password + str(i)
-print(gen_password)
-=======
-alpha="abcdefghijklmnopqrstuvwxyz"
-num="0123456789"
-special="@#$%&*"
-
-#pass_len=random.randint(8,13)  #without User INput
-pass_len=int(input("Enter Password Length"))
-
-#length of password by 50-30-20 formula
-alpha_len=pass_len//2
-num_len=math.ceil(pass_len*30/100)
-special_len=pass_len-(alpha_len+num_len)
-
-
-password=[]
-
-def generate_pass(length,array,is_alpha=False):
-  
-    for i in range(length):
-        index=random.randint(0,len(array)-1)
-        character=array[index]
-        if is_alpha==True:
-            
-            case=random.randint(0,1)
-            if case==1:
-                character=character.upper()
-        
-        password.append(character)
-
-#alpha password     
-generate_pass(alpha_len,alpha,True)
-#numeric password
-generate_pass(num_len,num)
-#special Character password
-generate_pass(special_len,special)
-
-#suffle the generated password list
-random.shuffle(password)
-
-#convert List To string
-gen_password=""
-for i in password:
-    gen_password=gen_password+str(i)
-
-print(gen_password)
-
-
->>>>>>> 760b764f0e43d93842442ba57e745ef195a27d42
+import random
+import math
+
+alpha = "abcdefghijklmnopqrstuvwxyz"
+num = "0123456789"
+special = "@#$%&*"
+
+# pass_len=random.randint(8,13)  #without User INput
+pass_len = int(input("Enter Password Length"))
+
+# length of password by 50-30-20 formula
+alpha_len = pass_len//2
+num_len = math.ceil(pass_len*30/100)
+special_len = pass_len-(alpha_len+num_len)
+
+
+password = []
+
+
+def generate_pass(length, array, is_alpha=False):
+    for i in range(length):
+        index = random.randint(0, len(array) - 1)
+        character = array[index]
+        if is_alpha:
+            case = random.randint(0, 1)
+            if case == 1:
+                character = character.upper()
+        password.append(character)
+
+
+# alpha password
+generate_pass(alpha_len, alpha, True)
+# numeric password
+generate_pass(num_len, num)
+# special Character password
+generate_pass(special_len, special)
+# suffle the generated password list
+random.shuffle(password)
+# convert List To string
+gen_password = ""
+for i in password:
+    gen_password = gen_password + str(i)
+print(gen_password)
diff --git a/projects/string search from multiple files/files/file1.txt b/projects/string search from multiple files/files/file1.txt
new file mode 100644
index 00000000..a4271094
--- /dev/null
+++ b/projects/string search from multiple files/files/file1.txt	
@@ -0,0 +1,2 @@
+this is file one 
+this is file one this is file one this is file one this is file one this is file one this is file one 
\ No newline at end of file
diff --git a/projects/string search from multiple files/files/file2.txt b/projects/string search from multiple files/files/file2.txt
new file mode 100644
index 00000000..25d43756
--- /dev/null
+++ b/projects/string search from multiple files/files/file2.txt	
@@ -0,0 +1 @@
+this is file two
\ No newline at end of file
diff --git a/projects/string search from multiple files/files/file3.txt b/projects/string search from multiple files/files/file3.txt
new file mode 100644
index 00000000..869e86a8
--- /dev/null
+++ b/projects/string search from multiple files/files/file3.txt	
@@ -0,0 +1 @@
+this is file three
\ No newline at end of file
diff --git a/projects/string search from multiple files/files/folder1/hello.txt b/projects/string search from multiple files/files/folder1/hello.txt
new file mode 100644
index 00000000..ed253a76
--- /dev/null
+++ b/projects/string search from multiple files/files/folder1/hello.txt	
@@ -0,0 +1 @@
+this is hello world
\ No newline at end of file
diff --git a/projects/string search from multiple files/files/folder1/python.txt b/projects/string search from multiple files/files/folder1/python.txt
new file mode 100644
index 00000000..e4d1b6f8
--- /dev/null
+++ b/projects/string search from multiple files/files/folder1/python.txt	
@@ -0,0 +1,2 @@
+this is python file
+learn python
\ No newline at end of file
diff --git a/projects/string search from multiple files/findstring.py b/projects/string search from multiple files/findstring.py
new file mode 100644
index 00000000..9f8f0445
--- /dev/null
+++ b/projects/string search from multiple files/findstring.py	
@@ -0,0 +1,33 @@
+import os
+
+text = input("input text : ")
+
+path = input("path : ")
+
+# os.chdir(path)
+
+
+def getfiles(path):
+    f = 0
+    os.chdir(path)
+    files = os.listdir()
+    # print(files)
+    for file_name in files:
+        abs_path = os.path.abspath(file_name)
+        if os.path.isdir(abs_path):
+            getfiles(abs_path)
+        if os.path.isfile(abs_path):
+            f = open(file_name, "r")
+            if text in f.read():
+                f = 1
+                print(text + " found in ")
+                final_path = os.path.abspath(file_name)
+                print(final_path)
+                return True
+
+    if f == 1:
+        print(text + " not found! ")
+        return False
+
+
+getfiles(path)