update network cmd
solve conflicts