Improve conflict error message