readme updated

Author: amangit1314

README.md

@@ -1,16 +1,8 @@
-<<<<<<< HEAD
 # Java-Programs
 This is a repository where, I will upload and keep up to date my Java, DataStructure and algorithms code and question regarding to them,which i practiced on eclipse & IntelliJ with help of Books and programming websites. The books I prefer and use for learning java and algorithms are:
 
 1. Java for Dummies.
 2. Java The Complete Reference by Herberth Schildt.
 3. Algorithms by Sedwig.
 4. Algorithms by Cormen.
-=======
-# Java-Programs <a href="https://www.java.com" target="_blank"> <img src="https://devicons.github.io/devicon/devicon.git/icons/java/java-original-wordmark.svg" alt="java" width="40" height="40"/> </a>
-This is a repository where, I will upload and keep up to date my Java, DataStructure and algorithms code and question regarding to them,which i practiced on eclipse & IntelliJ with help of Books and programming websites. The books I prefer and use for learning java and algorithms are:
-
-1. Java for Dummies.
-2. Algorithms by Sedwig.
-3. Algorithms by Cormen.
->>>>>>> fc390b5cc5867b507eabc367ba4f0b0ac46bf243
+<a href="https://www.java.com" target="_blank"> <img src="https://devicons.github.io/devicon/devicon.git/icons/java/java-original-wordmark.svg" alt="java" width="40" height="40"/> </a>