test merge with no arguments
Merge branch 'master' of github.com:twitter/flight