Changing edit method and creating the first version of the form
Resolving conflicts.