fix conflics