Remove merge markup from brickhouse.hql