add conflict1.txt file to test conflict handling in a team setting