merge busted code highlight change