Some comments; couldn't run LaTeX due to a missing file
conflict resolved