add b.txt
add c.txt
add f.txt
Merge branch 'development'
fix f.txt
add g.txt
Merge branch 'hotfix/stuff' into development