initial commit for merging list items.
some bug fixes against the merging.