8415b12 Fix merge conflicts

Merged and Committed by Fabio Alessandro Locati 8 years ago
    Fix merge conflicts
    
        
file modified
+6 -1