remove duplicate rules
edit hidden rules/todo
merge fix