add selection KeyColumn
resolve conflict
fix datagrid columns