GitHub Desktop 1.5 release is solving merge conflicts | Hacker News Reader