Stop cherry-picking, start merging, Part 1: The merge conflict | Heykuki News