settings model added
conflict resolved