sample merge conflict change
WIP - refactoring the way dropping a metric works