diff --git a/app/components/architecture-viewer.js b/app/components/architecture-viewer.js
index 61e9d6cdb172b1a720bd97bd77e3e45f158f6af6..8648937394d6a12d0898898f116735392525cb6e 100644
--- a/app/components/architecture-viewer.js
+++ b/app/components/architecture-viewer.js
@@ -10,10 +10,7 @@ export default Ember.Component.extend({
     layoutAlgorithms: [
         'cose-bilkent',
         'cose',
-<<<<<<< HEAD
         // 'cose-bilkent', // broken - see https://github.com/cytoscape/cytoscape.js-cose-bilkent/issues/18
-=======
->>>>>>> da62a369c3eb11a12b3b712bdb1628f3f87bf94a
         'cola',
         'grid',
         'concentric',