Resolve git merge conflicts in Atom