mergerd conflicts in online.tex