Add todo: test conflict on new file