add ternaire
merge log