6dd9b7 cleaned git conflict messages

Merged and Committed by germano 3 years ago
    cleaned git conflict messages
    
        
file modified
+14 -1