fix merge conflicts

client/modules/IDE/components/Editor.js

@@ -12,7 +12,8 @@ class Editor extends React.Component {
       lineNumbers: true,
       styleActiveLine: true,
       inputStyle: 'contenteditable',
-      mode: 'javascript'
+      mode: 'javascript',
+      lineWrapping: true
     });
     this._cm.on('change', () => { // eslint-disable-line
       // this.props.updateFileContent('sketch.js', this._cm.getValue());

client/styles/layout/_ide.scss

@@ -6,12 +6,13 @@
 }
 
 .editor-holder {
-	flex-grow: 1;
+	flex: 1 0 0;
+  max-width: 45%;
 	height: 100%;
 }
 
 .preview-frame {
-	flex-grow: 1;
+	flex: 1 0 0;
 }
 
 .toolbar {