Add automatically enabling of merging settings.
Add ediff settings.
Add expand-region.
Add magit settings.