Added changes to form
Solved merge conflict