remove some semicolons
option to keep branches
Merge remote-tracking branch 'source/master'