Finish team relationship
fix conflict in test