Gemfile modified, newrelic gem moved to general gem group
Modal is working with relative sizes
Merge conflicts are fixed