conflict resolution
conflict resolution
New pav model and animations.