Gemfile.lock Merge Conflict went with sprockets 2.11 istead of 2.12