update settings forms
fix merge conflicts