Resolve Conflict in LogicTest