merged conflicts in markovSynthExpt.m