insns.pl: Fix up merge conflict for sure