Merge pull request #481 from vstakhov/master

Make conflicts events more informative.