fixed merge conflict in morph.tex and concept.tex