Modified file1 for conflicts