merge with logic
merge with logic