When a conflict is accidentally resolved (such a pressing `a` twice), there is no way to get back to it with `p` and reedit.