fix conflect