Don't duplicate fetch/push settings on config step
Merge branch 'bug/config/duplicates'