Show HN: Fix All Conflicts – command line app for fixing merge conflicts | Heykuki News