test conflict
mixed comments and new file okay