resolved merge conflict

Casks/alfred.rb

@@ -1,6 +1,7 @@
 class Alfred < Cask
-  url 'http://cachefly.alfredapp.com/alfred_1.3.2_265.zip'
+  url 'http://cachefly.alfredapp.com/Alfred_2.0.1_173.zip'
   homepage 'http://www.alfredapp.com/'
-  version '1.3.2_265'
+  version '2.0.1_173'
-  sha1 'e10f15a0ae758cae2a22557f14890fa5989260ce'
+  content_length '2869071'
+  sha1 '3b5e59e799d7f42bc73fbd425e85b6154608a98b'
 end

Casks/virtualbox.rb

@@ -1,6 +1,7 @@
 class Virtualbox < Cask
   homepage 'http://www.virtualbox.org'
-  version '4.2.6.82870'
+  version '4.2.10-84104'
-  url 'http://download.virtualbox.org/virtualbox/4.2.6/VirtualBox-4.2.6-82870-OSX.dmg'
+  url 'http://download.virtualbox.org/virtualbox/4.2.10/VirtualBox-4.2.10-84104-OSX.dmg'
-  sha1 '7053bba27409cd9fbb661962bc9605bf3ce7002a'
+  content_length '109022269'
+  sha1 'e4d016587426c1ef041bd460905b5385e566fe77'
 end