changed names of forms for new project
resolved conflicts and merged