fix merge conflicts in reftest.list