clear form after save
fix merge failed