add form
task 2 finished
merge