Local changes
Yaml mode
Quickrun
Fixing conflicts