First commit on branch1
More code on branch1
Update index.jsp
Merge conflicts resolved