Minor fix to the merge