#358428 options to choose newer/larger/older/smaller file to resolve conflict