please no more conflicts please

Conflicts:
	paper.tex
merged