Bump Rails to 4.1.2

guides/content/developer/tutorials/getting_started_tutorial.md

@@ -9,14 +9,14 @@ Before starting this tutorial, make sure you have Ruby and RubyGems installed on
 
 By following this tutorial, you will create a simple Spree project called `mystore`. Before you can start building the application, you need to make sure that you have Rails itself installed.
 
-To run Spree 2.2 you need the latest Rails version, 4.0.5.
+To run Spree 2.3 you need the latest Rails version, 4.1.2.
 
 ### Installing Rails
 
 In most cases, the easiest way to install Rails is to take advantage of RubyGems:
 
 ```bash
-$ gem install rails -v 4.0.5
+$ gem install rails -v 4.1.2
 ```
 
 ### Installing Bundler
@@ -56,7 +56,11 @@ The distribution of Spree as a Rubygem allows it to be used in a new Rails proje
 Let's start by creating a standard Rails application using the following command:
 
 ```bash
+<<<<<<< HEAD
 $ rails _4.0.5_ new mystore
+=======
+$ rails _4.1.2_ new mystore
+>>>>>>> Bump Rails to 4.1.2
 ```
 
 ### Adding Spree to Your Rails Application