bad merge with v6r11