Fail on conflict instead of error

in `persist_resolution': undefined method `correct?' for nil:NilClass (NoMethodError)