Add layerSettings class
merge + conflict