started to connect categories with datagrid
fixed merge conflict