merging software.tex
merge