including file a
Including file c
Merge branch 'bugfix'