merged greggs commits