How To Resolve Conflicts In Github Pull Request