added list_merge, fixed bug