Fixed merge conflict

bin/powder

@@ -4,15 +4,17 @@ require 'rubygems'
 require 'thor'
 require 'fileutils'
 require 'net/https'
+require 'powder/version'
 
-class Powder < Thor
+class PowderCLI < Thor
   include Thor::Actions
   default_task :link
 
   map '-r' => 'restart'
   map '-l' => 'list'
   map '-L' => 'link'
   map '-o' => 'open'
+  map '-v' => 'version'
 
   POWPATH = "#{`echo ~`.chomp}/.pow"
 
@@ -63,6 +65,11 @@ class Powder < Thor
   def uninstall
     %x{curl get.pow.cx/uninstall.sh | sh}
   end
+
+  desc "version", "Shows the version"
+  def version
+     say "powder #{Powder::VERSION}"
+  end
 
   private
 
@@ -109,4 +116,4 @@ class Powder < Thor
     end
   end
 end
-Powder.start
+PowderCLI.start