Default opts
Let me fix that merge for you git
Merge branch 'master' into edge
My custom opts