diff --git a/String/ZigZagConversion/ZigZag_Conversion.cpp b/String/ZigZagConversion/ZigZag_Conversion.cpp
new file mode 100644
index 0000000..64a461e
--- /dev/null
+++ b/String/ZigZagConversion/ZigZag_Conversion.cpp
@@ -0,0 +1,48 @@
+#include<iostream>
+#include<vector>
+#include<string>
+using namespace std;
+string convert(string s, int numRows) {
+    vector<string>v(numRows,"");// for storing the new pattern
+    int fg=0;//flag for direction
+    int n=s.size();
+    for(int i=0;i<n;i++){
+        if(fg==0){
+            int count=0;
+            while(i<n&&count<numRows){
+                v[count]+=s[i];
+                i++;
+                count++;
+            }
+        }
+        else{
+            int count=numRows-2;
+            while(i<n && count>0){
+                v[count]+=s[i];
+                i++;
+                count--;
+            }
+        }
+        fg=1-fg;
+        i--;
+    }
+    //forming the final string
+    string ans="";
+    for(int i=0;i<numRows;i++){
+        ans+=v[i];
+    }
+    return ans;
+}
+int main(){
+	string inputstr;
+	int numRows;
+	int testcases;
+	cin>>testcases;
+	while(testcases--){
+		cin>>inputstr;
+		cin>>numRows;
+		string a=convert(inputstr,numRows);
+		cout<<a<<"\n";
+	}
+	return 0;
+}
diff --git a/String/ZigZagConversion/ZigZag_Conversion.cpp~ b/String/ZigZagConversion/ZigZag_Conversion.cpp~
new file mode 100644
index 0000000..64a461e
--- /dev/null
+++ b/String/ZigZagConversion/ZigZag_Conversion.cpp~
@@ -0,0 +1,48 @@
+#include<iostream>
+#include<vector>
+#include<string>
+using namespace std;
+string convert(string s, int numRows) {
+    vector<string>v(numRows,"");// for storing the new pattern
+    int fg=0;//flag for direction
+    int n=s.size();
+    for(int i=0;i<n;i++){
+        if(fg==0){
+            int count=0;
+            while(i<n&&count<numRows){
+                v[count]+=s[i];
+                i++;
+                count++;
+            }
+        }
+        else{
+            int count=numRows-2;
+            while(i<n && count>0){
+                v[count]+=s[i];
+                i++;
+                count--;
+            }
+        }
+        fg=1-fg;
+        i--;
+    }
+    //forming the final string
+    string ans="";
+    for(int i=0;i<numRows;i++){
+        ans+=v[i];
+    }
+    return ans;
+}
+int main(){
+	string inputstr;
+	int numRows;
+	int testcases;
+	cin>>testcases;
+	while(testcases--){
+		cin>>inputstr;
+		cin>>numRows;
+		string a=convert(inputstr,numRows);
+		cout<<a<<"\n";
+	}
+	return 0;
+}
diff --git a/String/ZigZagConversion/ZigZag_Conversion.txt b/String/ZigZagConversion/ZigZag_Conversion.txt
new file mode 100644
index 0000000..b548379
--- /dev/null
+++ b/String/ZigZagConversion/ZigZag_Conversion.txt
@@ -0,0 +1,11 @@
+The string "PAYPALISHIRING" is written in a zigzag pattern on a given number of rows like this: (you may want to display this pattern in a fixed font for better legibility)
+
+		P.......A.......H.......N
+		..A...P...L...S...I...I...G
+		....Y.......I.......R
+		
+And then read line by line: PAHNAPLSIIGYIR
+
+Write the code that will take a string and make this conversion given a number of rows:
+	string convert(string text, int nRows);
+Convert("PAYPALISHIRING", 3) should return "PAHNAPLSIIGYIR"