final adfs
merge