updated filters
merge conflict resolution