June 25th wrap-up
merge issue