Round out conflict handling with a default implementation of "server wins".