merge drop_puppet