MAGETWO-31484: resolved merge conflicts

Author: Joan He

app/code/Magento/Cms/composer.json

@@ -11,8 +11,8 @@
         "magento/module-catalog": "0.42.0-beta8",
         "magento/module-email": "0.42.0-beta8",
         "magento/module-ui": "0.42.0-beta8",
-        "magento/framework": "0.42.0-beta8",
         "magento/module-variable": "0.42.0-beta8",
+        "magento/framework": "0.42.0-beta8",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",

app/code/Magento/Version/composer.json

@@ -3,7 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/framework": "0.42.0-beta7",
+        "magento/framework": "0.42.0-beta8",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",