override #merge_join; fix missing 'end'