Manage conflicts.
Merge branch 'master' of https://github.com/ECML/ECML.git