Add action on top menu
add design list view
resolve conflicts