GitHub repository: ElastiLotem/resolve-trivial-conflicts
Primary language: Haskell
Description: Resolve trivial conflicts