tests for team movements is working
fixed merging issues