update domain url
fix merge conflict