fix double declarations introduced by auto merge
fix double declarations introduced by auto merge

mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs