uber conflicts resolved