Bug fix in file1
Merge branch 'feature1' into stage
Added file2 for feature1
Merge branch 'feature1' into preprod
Initial commit feature3
Merge branch 'f3' into stage