merge in emerald-release history after reset to emerald-dev