More bad merge text.