2372a9 Fix broken conflict

Authored and Committed by malmond 3 years ago
    Fix broken conflict
    
        
file modified
+5 -2