Fixed conflict resolution cruft.