fix an error with merge