[OPENENGSB-3446] cleand up after merge