conflict in names solved