Text added to scribes.tex
fixed conflicts