protecting against null filter
resolving merge conflicts