Added third method of handling with conflicts in pull requests.
Merge pull request #52 from smt116/maciej-malecki

Added third method of handling with conflicts in pull requests.