diff --git a/pdf.js b/pdf.js
index d8c51708b..cdc8b6665 100644
--- a/pdf.js
+++ b/pdf.js
@@ -368,6 +368,7 @@ var FlateStream = (function() {
             var bufferLength = this.bufferLength;
             var bufferPos = this.bufferPos;
             var n = 0;
+            
             // entire front of stream needs to be copied over since flate
             // looksback when decoding
             while (0 < bufferLength)
@@ -2141,7 +2142,6 @@ var CanvasGraphics = (function() {
                         error("unhandled amount of components per pixel: " + numComps);
                     }
                 }
->>>>>>> 496a6374c1ac04e
             }
             tmpCtx.putImageData(imgData, 0, 0);
             this.ctx.drawImage(tmpCanvas, 0, 0);
diff --git a/test.html b/test.html
index 10a35e163..09ccf62d2 100644
--- a/test.html
+++ b/test.html
@@ -34,13 +34,25 @@ span#info {
   </style>
 
 <script type="text/javascript">
+function queryParams() {
+    var qs = window.location.search.substring(1);
+    var kvs = qs.split("&");
+    var params = { };
+    for (var i = 0; i < kvs.length; ++i) {
+        var kv = kvs[i].split("=");
+        params[unescape(kv[0])] = unescape(kv[1]);
+    }
+    return params;
+}
+
 var canvas, numPages, pageDisplay, pageNum;
 function load() {
     canvas = document.getElementById("canvas");
     canvas.mozOpaque = true;
     pageDisplay = document.getElementById("pageNumber");
     infoDisplay = document.getElementById("info");
-    open("uncompressed.tracemonkey-pldi-09.pdf");
+    pageNum = parseInt(queryParams().page) || 1;
+    open("compressed.tracemonkey-pldi-09.pdf");
 }
 
 function open(url) {
@@ -61,7 +73,8 @@ function xhrstate() {
                    req.response;
         pdf = new PDFDoc(new Stream(data));
         numPages = pdf.numPages;
-        displayPage(1);
+        document.getElementById("numPages").innerHTML = numPages.toString();
+        gotoPage(pageNum);
     }
 }
 
@@ -113,6 +126,7 @@ function gotoPage(num) {
     <button onclick="nextPage();">Next</button>
     <input type="text" id="pageNumber" onchange="gotoPage(this.value);"
            value="1" size="4"></input>
+    / <span id="numPages">--</span>
     <span id="info"></span>
   </div>
   <div id="viewer">