https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git-repository
https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull
