merge and resolve conflict

diff --cc Makefile
Simple merge

diff --cc classlist.h
index 67f6f8b7e89a9191988ac07abfb104a2911b6412,e6a5e4ec7e2e091673d569ea6db118d53649b4d3..3aca3e11ceb086a65aef19bf2dec9caf05b90db4
--- 1/classlist.h
--- 2/classlist.h
+++ b/classlist.h
@@@ -22,5 -17,6 +20,7 @@@ class FuncInst
  struct model_snapshot_members;
  struct bug_message;
  typedef SnapList<ModelAction *> action_list_t;
 +typedef SnapList<uint32_t> func_id_list_t;
+ 
+ extern volatile int forklock;
  #endif

diff --cc execution.cc
index 1776741951eaab170c995dda6378ad3ae44fceee,c9fb39f1f2010a5dac9ea98ee45808bcecc75ca4..c5c40a91f7776d43e98dd3cc027e8b9b05db56b0
--- 1/execution.cc
--- 2/execution.cc
+++ b/execution.cc
@@@ -63,12 -61,9 +62,11 @@@ ModelExecution::ModelExecution(ModelChe
        mutex_map(),
        thrd_last_action(1),
        thrd_last_fence_release(),
-       node_stack(node_stack),
        priv(new struct model_snapshot_members ()),
 -                       mo_graph(new CycleGraph()),
 -      fuzzer(new Fuzzer())
 +      mo_graph(new CycleGraph()),
 +      fuzzer(new Fuzzer()),
 +      thrd_func_list(),
 +      thrd_func_inst_lists()
  {
        /* Initialize a model-checker thread, for special ModelActions */
        model_thread = new Thread(get_next_id());

diff --cc execution.h
Simple merge