skip animation done
conflict resolved