adjusted the forms
merged conflicts
merge conflicts