changes for r22 in file file2
conflicting changes introduced in file 2
final version of file2
merged file2
Merge branch 'r2'