Reducing opportunity for complex merge conflicts.