resolve conflict

diff --combined src/Backend/satfuncopencoder.c
index 1fc8ae67815c763bcc70d4794b71432943789ebb,881839fb5cff6b2c784f8a993f24cc1e780b9503..94b990980136383d01e834127498092439d3c71b
--- 1/src/Backend/satfuncopencoder.c
--- 2/src/Backend/satfuncopencoder.c
+++ b/src/Backend/satfuncopencoder.c
@@@ -75,7 -75,7 +75,7 @@@ Edge encodeEnumOperatorPredicateSATEnco
                        }
                }
        }
 -      if(getSizeVectorEdge(clauses) == 0){
 +      if(getSizeVectorEdge(clauses) == 0) {
                deleteVectorEdge(clauses);
                return E_False;
        }
@@@ -186,7 -186,10 +186,10 @@@ void encodeOperatorElementFunctionSATEn
                        }
                }
        }
- 
+       if(getSizeVectorEdge(clauses) == 0){
+               deleteVectorEdge(clauses);
+               return;
+       }
        Edge cor=constraintAND(This->cnf, getSizeVectorEdge(clauses), exposeArrayEdge(clauses));
        addConstraintCNF(This->cnf, cor);
        deleteVectorEdge(clauses);
@@@ -219,4 -222,4 +222,4 @@@ Edge encodeCircuitEquals(SATEncoder * T
                carray[i]=constraintIFF(This->cnf, ee0->variables[i], ee1->variables[i]);
        }
        return constraintAND(This->cnf, numVars, carray);
 -}
 +}