Remove merge markup from brickhouse.hql
Merge pull request #107 from jonbender/fixup_hql

Remove merge markup from brickhouse.hql