change site url
bizarre merge conflict