Start merging in settings
Add settings view