Merge settings branch