resolve merge conflicts
team member tab