resolved conflicts in table rule