trying to fix conflics