fix merge conflicts

app/components/App.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react'
-import DatasetContainer from '../containers/DatasetContainer'
+import Dataset from './Dataset'
 
 // App is the main component and currently the only view
 // Everything must flow through here
 export default class App extends React.Component {
   render () {
     return (
-      <div id='app'>
-        <DatasetContainer />
+      <div id='app' style={{ height: '100%' }}>
+        <Dataset />
       </div>
     )
   }

app/containers/DatasetContainer.tsx → app/components/Dataset.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Resizable } from '../components/resizable'
 import DatasetSidebar from '../components/DatasetSidebar'
 
-const defaultSidebarWidth = 250
+const defaultSidebarWidth: number = 250
 
 export default class DatasetContainer extends React.Component<{}, { showDatasetList: boolean, sidebarWidth: number }> {
   constructor (p: {}) {
@@ -30,7 +30,7 @@ export default class DatasetContainer extends React.Component<{}, { showDatasetL
     const expandedClass = showDatasetList ? 'expanded' : ''
 
     return (
-      <div id='dataset-container'>
+      <div id='dataset-wrapper'>
         <div className='header'>
           <div
             className={'current-dataset header-column ' + expandedClass}

app/components/DatasetSidebar.tsx

@@ -4,7 +4,7 @@ interface FileRowProps {
   name: string
 }
 
-const FileRow: React.SFC<FileRowProps> = (props) => {
+const FileRow: React.FunctionComponent<FileRowProps> = (props) => {
   return (
     <div className='file-row sidebar-row'>
       <div className='label'>{props.name}</div>

app/containers/AppContainer.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 export default class AppComponent extends React.Component {
   render () {
     return (
-      <div id="app-container">{this.props.children}</div>
+      <div style={{ height: '100%' }}>{this.props.children}</div>
     )
   }
 }