0d437b cleaned git conflict messages

Merged and Committed by germano 4 years ago
    cleaned git conflict messages
    
        
file modified
+8 -2