Adding form to admin page
Resolving conflicts