form changes
conflict resolved