fixed sortable merge issue + padding