Checking for conflict

This will test conflict handling of team.
Merge pull request #2 from somimar/dex_feature2

Checking for conflict