merge august 19