fix bad merge on form