removing defunct (renamed) file
fixed merge
more merge conflicts
renaming html files