progress on the device sync and merge