Match history and settings
Fixed merges