diff --git a/dist/sass.js b/dist/sass.js
index a1c019a..8b53ecc 100644
--- a/dist/sass.js
+++ b/dist/sass.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/*! sass.js - v0.4.0 - 2014-06-06 */
-=======
-/*! sass.js - v0.0.0 - 2014-08-31 */
->>>>>>> master
+/*! sass.js - v0.5.0 - 2014-08-31 */
 (function (root, factory) {
   'use strict';
   if (typeof define === 'function' && define.amd) {
diff --git a/dist/sass.worker.js b/dist/sass.worker.js
index 022dc4b..b7a7773 100644
--- a/dist/sass.worker.js
+++ b/dist/sass.worker.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/*! sass.js - v0.4.0 - web worker - 2014-06-06 */(function (root, factory) {
-=======
-/*! sass.js - v0.0.0 - web worker - 2014-08-31 */(function (root, factory) {
->>>>>>> master
+/*! sass.js - v0.5.0 - web worker - 2014-08-31 */(function (root, factory) {
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
diff --git a/dist/worker.js b/dist/worker.js
index f0c12e7..1bef6f8 100644
--- a/dist/worker.js
+++ b/dist/worker.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/*! sass.js - v0.4.0 - web worker - 2014-06-06 */'use strict';
-=======
-/*! sass.js - v0.0.0 - web worker - 2014-08-31 */'use strict';
->>>>>>> master
+/*! sass.js - v0.5.0 - web worker - 2014-08-31 */'use strict';
 /*global Sass, postMessage, onmessage:true, importScripts*/
 importScripts('sass.min.js');
 
diff --git a/dist/worker.min.js b/dist/worker.min.js
index a2ca9ae..60a6bf9 100644
--- a/dist/worker.min.js
+++ b/dist/worker.min.js
@@ -4293,11 +4293,7 @@ $._main(W,Ja,0);$.noExitRuntime||yk(Ia)}catch(ea){if(!(ea instanceof dh))if("Sim
 if(D.length)try{W.stat(D.join("/"))}catch(G){Of._createPath(D)}},writeFile:function(D,G){var $=Of._absolutePath(D);try{return Of._ensurePath($),W.writeFile($,G),Of._files[$]=D,!0}catch(Ja){return!1}},readFile:function(D){D=Of._absolutePath(D);try{return W.readFile(D,{encoding:"utf8"})}catch(G){}},listFiles:function(){return Object.keys(Of._files).map(function(D){return Of._files[D]})},removeFile:function(D){D=Of._absolutePath(D);try{return W.unlink(D),delete Of._files[D],!0}catch(G){return!1}},compile:function(D){try{var G=
 $.allocate([0],"i8",1),W=$.ccall("sass_compile_emscripten","string",["string","number","number","string","i8"],[D,Of._options.style,Of._options.comments,Of._path,G]),Ja=$.getValue(G,"*");if(Ja){var Ja=$.Pointer_stringify(Ja),Ra=Ja.match(/^source string:(\d+):/),Ia=Ja.slice(Ra[0].length).replace(/(^\s+)|(\s+$)/g,"");return{line:Number(Ra[1]),message:Ia}}return W}catch(ea){return{line:null,message:"Unknown Error: you need to compile libsass.js with exceptions to get proper error messages"}}}};return Of});
 
-<<<<<<< HEAD
-/*! sass.js - v0.4.0 - web worker - 2014-06-06 */'use strict';
-=======
-/*! sass.js - v0.0.0 - web worker - 2014-08-31 */'use strict';
->>>>>>> master
+/*! sass.js - v0.5.0 - web worker - 2014-08-31 */'use strict';
 /*global Sass, postMessage, onmessage:true, importScripts*/