diff --git a/providers/writing_a_new_provider.md b/providers/writing_a_new_provider.md
index cdabbe79..7f39e331 100644
--- a/providers/writing_a_new_provider.md
+++ b/providers/writing_a_new_provider.md
@@ -149,7 +149,7 @@ index b7e6783821..685474c570 100644
 +
 ```
 
-This is a bit optimistic since this hasn't been accepted into the ManageIQ organization yet :)
+This is a bit optimistic since this hasn't been accepted into the ManageIQ organization yet. :)
 
 To work on this plugin locally you have to tell bundler to look in a different place for your gem (more info in [developer_setup/plugins.md](../developer_setup/plugins.md))
 
@@ -166,6 +166,12 @@ $ cd ..
 $ bin/setup
 ```
 
+Lets also take this opportunity to commit the initial code built by the generator before we make any changes:
+```bash
+$ git add .
+$ git commit  -m "Initial commit"
+```
+
 Now that we have both sides linked up lets verify that everything worked:
 ```ruby
 $ bundle exec rails c
@@ -181,8 +187,6 @@ Now lets get that provider added so we have something to play with:
 ```ruby
 >> ems = ManageIQ::Providers::AwesomeCloud::CloudManager.create!(:name => "My Awesome Cloud", :zone => Zone.default_zone)
 ```
-<<<<<<< Updated upstream
-=======
 
 Now that we have that done it is time to start filling out our new provider.  The first step is to find the SDK gem for this provider.  If there isn't an provider SDK for ruby you have a few options which we'll cover later.  For now lets assume that Awesome Cloud has a ruby gem called 'awesome_cloud'.
 
@@ -207,6 +211,3 @@ Then bundle update to pull in the change
 ```
 $ bundle update
 ```
-
-Now that we have
->>>>>>> Stashed changes