Checking for conflict

This will test conflict handling of team.