Added third method of handling with conflicts in pull requests.