Improve error reporting for pull failures due to conflicts