plank animation updated
conflict resolved