Fix merge conflicts of the dirty warning feature

Guillem Bartrinarequested to merge
guillembartrina/purr-data:feature-dirtywarnings-rebased into dirty-abstraction-warnings

Merge request reports