Resolve conflict;
Add filter.