sortable categories added
conflict solved