c59ae5c fixing merge conflicts

Merged and Committed by hargonix 5 years ago
    fixing merge conflicts
    
        
file modified
+3 -0