Checking for conflict

This will test conflict handling of team.

We want to test how to handle conflicts in Git.