more on taprace
merge