add requestanimationframe polyfill
merge conflict