diff --git a/demo/demo.css b/demo/demo.css
index 90a7af4..bcf6203 100644
--- a/demo/demo.css
+++ b/demo/demo.css
@@ -89,7 +89,6 @@ div.expanded h2:before, div.collapsed h2:before {
 	font-size: 9px;
 	font-family: Monaco, monospace;
 }
-<<<<<<< HEAD
 
 div.collapsable {
 	overflow: hidden;
@@ -108,18 +107,6 @@ div.collapsed .collapsable {
 	clear: both;
 	height: 0;
 }
-div.expanded .collapsable {
-=======
-/* Can't seem to get this transition to work :( */
-div.collapsable {
->>>>>>> 11325bbf42fee0d080678ae5a55a8a0eeab70925
-	overflow: hidden;
-	clear: both;
-	height: 0px;
-	-moz-transition: height .2s linear;
-	-webkit-transition: height .2s linear;
-	transition: height .2s linear;
-}
 
 div.expanded { cursor: pointer; }
 
diff --git a/index.html b/index.html
index 7437a66..d14d23d 100644
--- a/index.html
+++ b/index.html
@@ -69,18 +69,10 @@
 					
 					if (this.className === 'collapsed') {
 						this.className = 'expanded';
-<<<<<<< HEAD
 						collapsable.style.height = wrapper.clientHeight + 'px';
 					} else {
 						this.className = 'collapsed';
 						collapsable.style.height = '0px';
-=======
-						var children = this.childNodes;
-						this.childNodes[3].style.height = 'auto';
-					} else {
-						this.className = 'collapsed';
-						this.childNodes[3].style.height = '0px';
->>>>>>> 11325bbf42fee0d080678ae5a55a8a0eeab70925
 					}
 				}
 				
@@ -300,11 +292,7 @@ document.getElementById("my-gui-container").appendChild( gui.domElement );</pre>
 		</div>
     </div>
 
-<<<<<<< HEAD
 	<div class="collapsed">
-=======
-	<div class="collapsed last">
->>>>>>> 11325bbf42fee0d080678ae5a55a8a0eeab70925
 	    <h2 class="section">Pro tips.</h2>
 		<div class="collapsable">
 			<div>