Remove ConflictError (which was also removed from bltinmodule.c, even though the checkin message failed to note that).
Remove ConflictError (which was also removed from bltinmodule.c, even
though the checkin message failed to note that).

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator