search filters
resolve merge confict