modified userFrom.jsp file
diff --git a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
index 1e1ad22..f61594b 100644
--- a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
+++ b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
@@ -12,7 +12,7 @@
<<<<<<< HEAD
<h1>Cognizant Test </h1>
=======
-<h1>Cognizant Technology Solution</h1>
+<h1>Cognizant Technology </h1>
>>>>>>> 46b94971157004bc4e2b04087cbc98cdd0caf8ef
<form:form method="POST" commandName="user">