Fix rule merge conflict