Working on form in home page
Resolved merge conflict