Resolved unintelligent merge (CNetwork)