better handling
merge