homepage change
gemfile lock conflict
merge