Merge replication has conflict which should put records into the conflict resolution panel (if I'm remembering SQL 2005 correctly). Peer to Peer replication doesn't have any sort of conflict detection. The newest version wins. There's some very basic conflict detection you can do, which just stops the distribution agent if there is a conflict.