Fixed warning in AchNetworkWidget about return code.
fixed merge conflict.