remove kumajaya skia merges