Merge roadmap/mergefix-proposals

# Conflicts:
#	src/components/MergeFixPanel.tsx
taigrrcommitted parent 486e8a2parent bdb0b5f1e3de79ddbfd7592ba6c37f5979921b3fad864a0Browse files
16 files changed+647−135

Rendering diff…