removed trace on xvelocity
merge conflict might be solved