copy changes
fix merge in copy of signup/step2