Adding settings files
Merging