fixing merge error in soap.tex