Fix up bad conflict resolution
Merge branch 'master' into pretty_formatter_use_debug_from_master