public marks

PUBLIC MARKS from mfaure with tags "merge conflict" & gitlab

mfaure's TAGS related to tag "merge conflict"

changelog +   gitlab +