fixing form steps
merge