tips: Fixup small merge conflict