Merge inn from No-BS