resolve conflicts for librarian-puppet
Merge pull request #1 from codec/fix-for-librarian-puppet

resolve conflicts for librarian-puppet