fix merge
finish merge
settings changed
testing