serf: Implement conflict delegate, provide slightly better error messages