Conflict Resolution and Office Ranking: Building Stronger Teams