li items animated
conflict resolution