some style hacks
Merge
Add the flag