Merge pull request ember-learn#628 from ember-learn/fix-build

fixing the build

Author: tomdale

guides/release/pages.yml

@@ -111,18 +111,13 @@
   pages:
     - title: Introduction
       url: "services"
-<<<<<<< HEAD
 
 - title: 'Data Management'
   url: 'data-management'
   pages:
     - title: "Overview"
       url: "index"
 
-=======
-- title: "Data Management"
-  url: "data-management"
->>>>>>> Added props and event handlers
 - title: "Ember Data"
   url: "models"
   pages: