proper template argument naming, part one
conceptualization
merge conflict resolution