/doc/automatic_conflict_resolution/