ucc_geth: Fix merge error.