Different IDs getting conflicts

We found out in production :slight_smile: