fixed ip
fixed conflicts