Sync and merge