compiling merge conflicted Sass