min
added conflict_handler=resolve