Resolve conflicting ids