diff --git a/docs/release_process.md b/docs/release_process.md
index f6d6a75..8d1d59b 100644
--- a/docs/release_process.md
+++ b/docs/release_process.md
@@ -5,12 +5,9 @@
 To release a new version of Ransack and publish it to RubyGems, take the following steps:
 
 - Create a new release, marked `Prerelease`.
-<<<<<<< Updated upstream
 - Update the versions file to the new release, commit and push to `master`.
-=======
-- Update the [version.rb](../lib/ransack/version.rb) file to the new release, commit and push to `master`.
->>>>>>> Stashed changes
-- From the terminal, run the following commands
+- Update the [`version.rb`](../lib/ransack/version.rb) file to the new release, commit and push to `master`.
+- From the terminal, run the following commands:
 
 ```bash
 rake build