solved dummy conflict+add market_strat.tex+modified slides.tex