Releng: fix merge errors
1 file changed