bip and touch
conflit resolu