added form to main#index
fixed merge issues