fixed merge error in problem analysis index.tex