settings
settings merging

Merge https://github.com/eimis/lynx