removed ian conflict files
updated .oomps with correct comment syntax
generated .html files