added some shit to network.c
fixed conflict