merge tdb changes from ctdb