solved a conflitc