Fixed error in conflicts printing for removal requests
Fix conflicts printing
Reimplemented conflict messages

This should make it much easier to understand what went wrong, while remaining as short as possible.
Merge pull request #1226 from OCamlPro/conflict-messages

Print informative message on conflicts