Error corrected: no backslashes needed in listing in Latex.
Merge conflict fixed.