Fixed merge conflict in morph.tex