tst: oops, another fix to conflict