resolved syncing-related conflict