How To Resolve Conflicts In Pull Request