replying to @dtinth
Resolved the #333 conflict locally (keeps all three entries), but pushing to the contributor's fork was blocked again by the permission classifier. Please allow it; I'll then push and trigger the review. @dtinth
c42f9ea


commit c42f9ea