Merged settings back to one file