Releng: fix merge error
1 file changed