63bb20b Resolve merge conflict

Merged and Committed by ovasik 7 years ago
    Resolve merge conflict
    
        
file modified
+7 -4