commit after resolving conflict

diff --combined src/Encoders/naiveelementencoder.c
index 58f63ac50032cc1335a1fb3e51bfd3a8b7707993,4d522352d00fb0189e771c602560050f221c22ff..bb6e91afca92743cfa537fcfbdc148315463b240
--- 1/src/Encoders/naiveelementencoder.c
--- 2/src/Encoders/naiveelementencoder.c
+++ b/src/Encoders/naiveelementencoder.c
@@@ -3,16 -3,21 +3,21 @@@
  #include "element.h"
  #include "set.h"
  #include "common.h"
 -#include "struct.h"
 +#include "structs.h"
+ #include <strings.h>
  
  void baseBinaryIndexElementAssign(ElementEncoding *This) {
        Element * element=This->element;
        Set * set=element->set;
        ASSERT(set->isRange==false);
        uint size=getSizeVectorInt(set->members);
-       This->encodingArray=ourmalloc(sizeof(uint64_t)*size);
+       uint encSize=NEXTPOW2(size);
+       allocEncodingArrayElement(This, encSize);
+       allocInUseArrayElement(This, encSize);
+ 
        for(uint i=0;i<size;i++) {
                This->encodingArray[i]=getVectorInt(set->members, i);
+               setInUseElement(This, i);
        }
-       This->type=BINARYINDEX;
  }
+