Started developing servlet
Merge Conflict resolved
web.xml corrected