fixed tb visit workflow
fixed conflicts