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