Fix merge error in cellular_gateway.py