log filter paramters
resolve merge conflict