diff --git a/java/Kumar_Asshole.java b/java/Kumar_Asshole.java
index 4f296c9..3e3f227 100644
--- a/java/Kumar_Asshole.java
+++ b/java/Kumar_Asshole.java
@@ -2,12 +2,16 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.*;
+<<<<<<< HEAD
 import java.util.regex.*;
+=======
+>>>>>>> b2e7a33... Java version of Kumar_asshole.sh
 
 import javax.mail.*;
 import javax.mail.internet.*;
 import javax.mail.search.FlagTerm;
 
+<<<<<<< HEAD
 public class Kumar_Asshole {
 
 	public static void main(String[] args) {
@@ -19,12 +23,36 @@ public class Kumar_Asshole {
 		Properties props = new Properties();
 
 		
+<<<<<<< HEAD
 	//modify below properties to your details
+=======
+	
+>>>>>>> ac58a6f... Signed-off-by: syedautherabbas <syedautherabbas@gmail.com>
 	String host = "smtp.gmail.com";
 	String username = "yourmailaddress@example.com goes here";
 	String password = "your password goes here ";
 	String Kumar_mail = "the mail address to be replied to !";
 		
+=======
+/* Before running:
+       U need  to  add Javax Mail JAR. 
+*/
+
+public class Kumar_Asshole {
+
+	public static void main(String[] args) {
+		Kumar_Asshole asshole = new Kumar_Asshole();
+		gmail.read_and_reply();
+	}
+
+	public void read_and_reply() {
+		Properties props = new Properties();
+//change the below properties to configure your own.
+		String host = "smtp.gmail.com";
+		String username = "yourmailaddress@example.com goes here";
+		String password = "your password goes here ";
+		String Kumar_mail = "the mail address to be replied to !";
+>>>>>>> b2e7a33... Java version of Kumar_asshole.sh
 		try {
 
 			Session session = Session.getDefaultInstance(props, null);
@@ -42,7 +70,13 @@ public class Kumar_Asshole {
 				if (messages[i].getFrom()[0].toString().contains(Kumar_mail)) {
 
 					String bodytext = null;
+<<<<<<< HEAD
 					Object content = messages[i].getContent();
+=======
+
+					Object content = messages[i].getContent();
+
+>>>>>>> b2e7a33... Java version of Kumar_asshole.sh
 					if (content instanceof String) {
 						bodytext = (String) content;
 
@@ -57,7 +91,11 @@ public class Kumar_Asshole {
 
 					Pattern pattern = Pattern.compile("sorry|help|wrong", Pattern.CASE_INSENSITIVE);
 					Matcher matcher = pattern.matcher(bodytext);
+<<<<<<< HEAD
 					// check all occurance
+=======
+					
+>>>>>>> b2e7a33... Java version of Kumar_asshole.sh
 
 					if (matcher.find()) {
 
@@ -65,6 +103,7 @@ public class Kumar_Asshole {
 						Address[] tomail;
 
 						MimeMessage msg = new MimeMessage(session);
+<<<<<<< HEAD
 						msg.setFrom(new InternetAddress(username));
 						tomail = messages[i].getFrom();
 						String t1 = tomail[0].toString();
@@ -91,4 +130,80 @@ public class Kumar_Asshole {
 			e.printStackTrace();
 		}
 	}
+=======
+
+						try {
+							msg.setFrom(new InternetAddress(username));
+						} catch (MessagingException e1) {
+							
+							e1.printStackTrace();
+						}
+
+						try {
+							tomail = messages[i].getFrom();
+							String t1 = tomail[0].toString();
+
+							msg.addRecipient(Message.RecipientType.TO, new InternetAddress(t1));
+						} catch (AddressException e1) {
+							
+							e1.printStackTrace();
+						} catch (MessagingException e1) {
+						
+							e1.printStackTrace();
+						}
+
+						
+						try {
+							msg.setSubject("Database fixes");
+						} catch (MessagingException e1) {
+							
+							e1.printStackTrace();
+						}
+
+						
+						try {
+							msg.setText("No problem. I've fixed it. \n\n Please be careful next time.");
+
+						} catch (MessagingException e1) {
+							
+							e1.printStackTrace();
+						}
+
+						Transport t = null;
+						try {
+
+							t = session.getTransport("smtps");
+						} catch (NoSuchProviderException e) {
+							
+							e.printStackTrace();
+						}
+						try {
+							try {
+								t.connect(host, username, password);
+							} catch (MessagingException e) {
+								
+								e.printStackTrace();
+							}
+
+							t.sendMessage(msg, msg.getAllRecipients());
+						} catch (MessagingException e) {
+
+							e.printStackTrace();
+
+						} finally {
+						}
+					}
+
+				}
+
+			}
+			inbox.close(true);
+			store.close();
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+>>>>>>> b2e7a33... Java version of Kumar_asshole.sh
 }
\ No newline at end of file