not sure what this commits?
change to views/homepage.handlebars
change to views/homepage
trying to commit
fixed conflicts