I did that merge-as-cherry-pick thing, but my change didn't merge correctly | Heykuki News