solve object conflicts