update github pages URL
fix merge conflict