Minor fix, conflict related