I'm pleased to announce that Git conflict markers are parsed as valid Scala | Hacker News Reader