fix git conflict

diff --cc Makefile
index fcebbf36c21ebcfd7988238d8ee3799fb00e5f27,0d2af4647ed740a8fb21decc2c36d6e0e5b71d40..214873ac0e0a7edacade3df693bbdc94193675c1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -5,7 -5,7 +5,7 @@@ OBJECTS := libthreads.o schedule.o mode
           datarace.o impatomic.o cmodelint.o \
           snapshot.o malloc.o mymemory.o common.o mutex.o conditionvariable.o \
           context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
-          sleeps.o history.o funcnode.o
 -         sleeps.o history.o printf.o
++         sleeps.o history.o funcnode.o printf.o
  
  CPPFLAGS += -Iinclude -I.
  LDFLAGS := -ldl -lrt -rdynamic
@@@ -34,10 -34,10 +34,10 @@@ README.html: README.m
        $(MARKDOWN) $< > $@
  
  malloc.o: malloc.c
-       $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
+       $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=1 $(CPPFLAGS) -Wno-unused-variable
  
 -futex.o: futex.cc
 -      $(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
 +#futex.o: futex.cc
 +#     $(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
  
  %.o : %.cc
        $(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)

diff --cc execution.cc
Simple merge

diff --cc execution.h
index 9487fd6e95b8dbd015244aab2e111ecc135e11f1,fa2b78b8a282fda6234f3090a00bda968104cc54..0a36d31cab50f5532f8171c9e3f83935ab39b840
--- 1/execution.h
--- 2/execution.h
+++ b/execution.h
@@@ -103,11 -103,10 +103,12 @@@ public
        action_list_t * get_action_trace() { return &action_trace; }
        Fuzzer * getFuzzer();
        CycleGraph * const get_mo_graph() { return mo_graph; }
-       HashTable<pthread_cond_t *, cdsc::condition_variable *, uintptr_t, 4> * getCondMap() {return &cond_map;}
-       HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
+       HashTable<pthread_cond_t *, cdsc::snapcondition_variable *, uintptr_t, 4> * getCondMap() {return &cond_map;}
+       HashTable<pthread_mutex_t *, cdsc::snapmutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
+       ModelAction * check_current_action(ModelAction *curr);
  
 +      SnapVector<func_id_list_t *> * get_thrd_func_list() { return &thrd_func_list; }
 +
        SNAPSHOTALLOC
  private:
        int get_execution_number() const;