show message about conflict
Merge pull request #6 from axce1/master

show message about conflict