some more of categories editing
resolve conflicts