resolve conflicts for librarian-puppet

Version '1.x' results in conflicts when librarian-puppet tries to resolve dependencies.