ProcessSimpleConflict 232 sync/engine/conflict_resolver.cc ProcessSimpleConflict(trans, *it, cryptographer, status); ProcessSimpleConflict 58 sync/engine/conflict_resolver.h void ProcessSimpleConflict(