resolve conflicts
Merge branch 'jmanuelrosa-master'