bionic: clean up noise causing conflicts from previous merge