Just today the author of the "merge-conflicts" package for Atom emphasized that his plugin is depcrecated because Atom 1.8 will have that feature included by default.

https://github.com/smashwilson/merge-conflicts/commit/f61950...

https://github.com/smashwilson/merge-conflicts/blob/master/d...