resolve those conflicts and have a happy relationship with git - View it on GitHub