added span
merge