Fix filter conflicts

Current the conflic detection is just stub, there are the classes and methods, but they do nothing.