add filter button
conflict resolving