history changed to form
fixed merges