Filter ideas merge conflict resolution