Herding works pretty well now
merge