6862e59 Fix conflicts

Merged and Committed by fale 7 years ago
    Fix conflicts
    
        
file modified
+3 -0