How to avoid merge conflicts | Hacker News Reader