Correct `reset` dup typo
Add Atom Merge Conflict plugin resource