fixed the form
fixed merging conflicts