resolve local page
Merge branch 'develop' of github.com:liangji101/arrow into develop