diff --git a/src/components/ThumbnailNavigation.js b/src/components/ThumbnailNavigation.js
index 50e599d25f22d91559f2fe0afceff3b8cd00b4d4..ac4d6d5bd34324e1654f969a344946ef65664363 100644
--- a/src/components/ThumbnailNavigation.js
+++ b/src/components/ThumbnailNavigation.js
@@ -101,13 +101,11 @@ export class ThumbnailNavigation extends Component {
    * canvases
    */
   calculateScaledWidth(options) {
-<<<<<<< HEAD
     const { config, canvasGroupings } = this.props;
-    const ret = canvasGroupings
+    return canvasGroupings
       .getCanvases(options.index)
       .map(canvas => new ManifestoCanvas(canvas))
       .reduce((acc, currentCanvas) => { return acc + (currentCanvas.hasValidDimensions ? Math.floor(config.thumbnailNavigation.height * currentCanvas.aspectRatio) : config.thumbnailNavigation.width); }, 8); // eslint-disable-line arrow-body-style, max-len
-    return ret;
   }
 
   /**
@@ -121,16 +119,6 @@ export class ThumbnailNavigation extends Component {
         return Math.ceil(window.canvasIndex / 2);
       default:
         return window.canvasIndex;
-=======
-    const { config, canvases } = this.props;
-    const canvas = new ManifestoCanvas(canvases[options.index]);
-    /*
-    if canvas provides valid dimensions return calculated width, based on height and aspectRatio,
-    otherweise return the default width
-    */
-    if (canvas.hasValidDimensions) {
-      return Math.floor(config.thumbnailNavigation.height * canvas.aspectRatio) + 8;
->>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
     }
   }
 
diff --git a/src/components/WindowSideBarCanvasPanel.js b/src/components/WindowSideBarCanvasPanel.js
index d7da82832688e96aed4eeb32b5272d7061aca736..f5799eda84006f8b257224dad2808105529bac44 100644
--- a/src/components/WindowSideBarCanvasPanel.js
+++ b/src/components/WindowSideBarCanvasPanel.js
@@ -4,14 +4,8 @@ import classNames from 'classnames';
 import Typography from '@material-ui/core/Typography';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
-<<<<<<< HEAD
 import { CanvasThumbnail } from './CanvasThumbnail';
 import ManifestoCanvas from '../lib/ManifestoCanvas';
-=======
-import { withStyles } from '@material-ui/core/styles';
-import ManifestoCanvas from '../lib/ManifestoCanvas';
-import CanvasThumbnail from './CanvasThumbnail';
->>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
 import { getIdAndLabelOfCanvases } from '../state/selectors';
 
 /**