Update Atom config
Use Sublime Text as git mergetool
Update SublimeText preferences