added 'waiting for other team' card
merge TimeBar
merging issues