After resolving conflicts ..

diff --cc src/csolver.cc
index 5b8f4cacdb0907bffbcba397434bf3a657e4dbf4,be4a3a88063882cc05f5cfafca9218724b870f72..d316724791f2648aa332e989d6a3507d99b8c0aa
--- 1/src/csolver.cc
--- 2/src/csolver.cc
+++ b/src/csolver.cc
@@@ -456,13 -473,13 +479,13 @@@ int CSolver::solve() 
        DecomposeOrderTransform dot(this);
        dot.doTransform();
  
-       IntegerEncodingTransform iet(this);
-       iet.doTransform();
+       //IntegerEncodingTransform iet(this);
+       //iet.doTransform();
  
 -      //EncodingGraph eg(this);
 -      //eg.buildGraph();
 -      //eg.encode();
 -      //printConstraints();
 +      EncodingGraph eg(this);
 +      eg.buildGraph();
 +      eg.encode();
 +//    printConstraints();
        naiveEncodingDecision(this);
        satEncoder->encodeAllSATEncoder(this);
        model_print("Is problem UNSAT after encoding: %d\n", unsat);

diff --cc src/csolver.h
Simple merge