r6371: fix botched merge of conflicte file