Updated file2 to test a conflict