gm:conflict_resolution