Show HN: Resolve Git Conflicts Automatically | Heykuki News