renamed generated files to html files
bumped version
resolved conflicts
version bump