merge in honeycomb-release history after reset to honeycomb