various minor changes
updated merge_parallel