Temoporarily remove test/fixtures/repo-merge-conflict-abort
Temoporarily remove test/fixtures/repo-merge-conflict-abort

Accidentally committed this as a git repo and it's not being tracked
correctly so I'm just deleting it and will re-add in next commit

atom/github,atom/github,atom/github