fix merge conflict

README.md

configure.sh

doc/counter_ex.h

doc/network.md

makefile

src/amd_rapl.c

src/network.c

src/util.h

tests/g5k/README

tests/g5k/config

tests/g5k/run

tests/g5k/site-runner-common.sh

tests/g5k/ssh.pre.config

tests/g5k/test-amd-rapl.sh

tests/g5k/test-counters.sh

tests/g5k/test-infiniband.sh

tests/g5k/test-load.sh

tests/g5k/test-network.sh

tests/g5k/test-nvidia.sh

tests/g5k/test-rapl.sh