ip changes...
more conflict fixes...