squashed history
edit settings
settings