Resolve merge conflicts

Author: JulienBerkane

courses/ada_essentials/060_record_types/04-record_aggregates.rst

@@ -268,7 +268,7 @@ D. :answermono:`X := (1, '2', 4, (others => 5))`
 
 .. container:: animate
 
-   A. :ada:`Four` **must** use named association for its components : :ada:`Four` => (Component => 6)
+   A. :ada:`Four` **must** use named association for its components : :ada:`Four` => (Component => 6) 
    B. :ada:`others` valid: :ada:`One` and :ada:`Three` are :ada:`Integer`
    C. Valid but :ada:`Y` is not initialized
    D. Positional for all components