atom-merge-conflicts (npm): Resolve git conflicts within Atom
Keywords: atom|conflict-resolution|merge-conflicts