fixed shaker
read more link
fix merge conflict