fixed branch from galaxy grid to master