first take at choosing better flags
Merge remote-tracking branch 'origin/master'
...