added GPNetDevice
fixed conflicts