id conflict fixes