[merge.c] fix problem with previous commit
[merge.c] fix problem with previous commit

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