Remove latent merge conflict in docstring.
Remove latent merge conflict in docstring.

datacats/datacats,florianm/datacats,dborzov/datacats,wardi/datacats,reneenoble/datacats,JackMc/datacats,datawagovau/datacats,JJediny/datacats,florianm/datacats,JackMc/datacats,wardi/datacats,deniszgonjanin/datacats,reneenoble/datacats,poguez/datacats,deniszgonjanin/datacats,dborzov/datacats,poguez/datacats,datawagovau/datacats,JJediny/datacats,datacats/datacats