fixed merge conflicts in filter view