Fixed the merge errors in the filters file