Get the first non-null type when merging

Itay Zandbankrequested to merge
660-take-the-first-non-null-typology-when-merging-line into develop

Closes #660 (closed)

Merge request reports