Form data merge fix