fix conflitcs