Fix conflicting IDs