refactored to allow for resolving slug conflicts