conflict resolution (no replies)

Hi,
for MySQL 5.1 ("free" version) or 5.5 (license needed)
InnoDB, is there replication conflict resolution available?

if not, what happens in case there is a conflict?

(I know MySQL cluster/ndb supports conflict resolution)

Thanks very much, Oded.