use correct types
merge