started on settings
merge