updated settings page
Merge pull request #38 from RTakes/conflict-res

updated settings page