Updated messages and URL in form
Resolved conflict