fixed conflict (not working)