fix forms 2
fix merge forms 2