Fix merge issue with xfail.list