updated data-grid
solved merge conflicts