diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..723284a
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,7 @@
+# Default ignored files
+<<<<<<< HEAD
+=======
+/workspace.xml
+# Default ignored files
+>>>>>>> 63b9a2e1d9f038c9049c6bbe3a6a62c8dd75bfbe
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/Jenkins.iml b/.idea/Jenkins.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/Jenkins.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..90f57e5
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Jenkins.iml" filepath="$PROJECT_DIR$/.idea/Jenkins.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/java-maven-junit-helloworld-master/Readme.txt b/java-maven-junit-helloworld-master/Readme.txt
index 221c907..53965a6 100644
--- a/java-maven-junit-helloworld-master/Readme.txt
+++ b/java-maven-junit-helloworld-master/Readme.txt
@@ -1 +1,6 @@
-This is Sample Text File.
\ No newline at end of file
+This is Sample Text File.
+This file is modified in IntelliJ IDEA.
+
+This file is created in my_test_branch.
+
+This file will now be merged with master branch.
\ No newline at end of file
diff --git a/java-maven-junit-helloworld-master/Readme.txt.txt b/java-maven-junit-helloworld-master/Readme.txt.txt
new file mode 100644
index 0000000..b2ee4f0
--- /dev/null
+++ b/java-maven-junit-helloworld-master/Readme.txt.txt
@@ -0,0 +1,2 @@
+This is my Text file.
+This file mofified for git stash test.
\ No newline at end of file
diff --git a/java-maven-junit-helloworld-master/test.txt b/java-maven-junit-helloworld-master/test.txt
new file mode 100644
index 0000000..29ca791
--- /dev/null
+++ b/java-maven-junit-helloworld-master/test.txt
@@ -0,0 +1 @@
+this is just a test file.
\ No newline at end of file