baseline change conflict not caught during github merge