commit after resolving conflict

diff --cc src/Encoders/naiveelementencoder.c
index 58f63ac50032cc1335a1fb3e51bfd3a8b7707993,4d522352d00fb0189e771c602560050f221c22ff..bb6e91afca92743cfa537fcfbdc148315463b240
--- 1/src/Encoders/naiveelementencoder.c
--- 2/src/Encoders/naiveelementencoder.c
+++ b/src/Encoders/naiveelementencoder.c
@@@ -3,7 -3,8 +3,8 @@@
  #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;