url corrected
conflicts resolved in master branch
conflicts resolved and form modified