Resolving merge
Resolved conflicts
Look this title.tex thing is not simplifying the doc. I put its contents back into the main tex