remove list, map and set artifacts
cleanup list, map and set nodes
solve merge conflict