Release notes update
Minor styling
Resolved conflicts
Store default settings if not already saved