fixed List syntax issue from merging