add push step
change production url
generated site
fix conflicts from url change