Documenting
[Conflict resolution]