working filter
resolve conflict