tween conflict resolution