filter conflict solved