daten merge fix