added date Filters
Fixed campaign type
Conflict Resolved