lappy config
merge conflict