resolve conflict
resolve conflict
add Filter.js