form changes and merged