fixed automatically merged Gemfile.lock (git replaced a line instead of adding both lines)