Dual origin with merge local strategy
MU Plugins
Merge remote-tracking branch 'origin/master'
Refactoring W3 plugin