return more info in debug response
merge conflict