merge-conflictsResolve git merge conflicts in Atom认领

Merge ConflictsDeprecation NoticeThis package is deprecated and subsumed by