[replay.c] fixed conflict
[replay.c] fixed conflict

Conflicts:
	filter/replay.c

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