add lab and data for 8/26
fix merge
fix merge