updating the form
fixing merge conflicts