resolve conflitcs