fixed small typo in conflict handler view
Merge pull request #24 from iaga84/feature/doesnotexist_typo

fixed small typo in conflict handler view
Merge pull request #4 from saxix/develop

develop: latest from upstream