sexy filter list
resolved conflicts and made things happy