Good call, at least this way the conflicts (if any) from repeated stuff will be consistent.