merge files from sampled-grid branch manually