librarian bump with proper merge