Adding file2 in a bug_fix_1 branch
Merge branch 'bug_fix_1'