22b6b87 Add conflicts

Authored and Committed by fjanus a year ago
    Add conflicts
    
        
file modified
+5 -0