adding ruby-generated values into html
fixing merge conflicts