small adaptations for sync and merge