Home / Atom / Merge Conflicts Merge Conflicts Resolve your git merge conflicts in Atom. Package 431 stars Archived GitHub Back to Atom