Merge "Extract addition of conflict header explanation"