add new file to test conflict