Fixing conflict erros in DateFilter