pages
new pages
CONFLICT on Gemfile.lock