Corrected add forms.
Fixed merge conflicts