Malcolm's commit
conflicts to Gemfile resolved