How to fix merge conflicts using GitHub's Atom text editor · HackerTrans