settings model now saving settings to database
resolved merge conflict