fix derp in remove kumajaya skia merges