filter lists
oops for this
resolved conflicts