some edit galleries
add nested set category
resolve conflict merge
resolve conflict merge