Correct type of error we need to rescue from
conflicts solved